update README

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

--- a/README.md
+++ b/README.md
@ -3,7 +3,7 @@
 Start drawing with Super+Alt+D.
 Then save your beautiful work by taking a screenshot.

-![](https://framagit.org/abakkk/DrawOnYourScreen/raw/media/screenshot.jpg)
+![](https://codeberg.org/som/DrawOnYourScreen/raw/branch/media/screenshot.jpg)

 ## Features

@ -18,13 +18,13 @@ Then save your beautiful work by taking a screenshot.
 ## Install

 1. Download and decompress or clone the repository
-2. Place the resulting directory in `~/.local/share/gnome-shell/extensions`
-3. **Change the directory name** to `drawOnYourScreen@abakkk.framagit.org`
+2. Place the directory (the one that contains `metadata.json`) in `~/.local/share/gnome-shell/extensions`
+3. **Change the directory name** to `draw-on-your-screen@som.codeberg.org`
 4. Xorg: type `alt + F2` and `r` to restart gnome-shell  
   Wayland: restart or re-login
-5. Enable the extension in gnome-tweaks or gnome-shell-extension-prefs
+5. Enable the extension with GNOME Extensions or GNOME Tweaks application
 6. `Super + Alt + D` to test
-7. [https://framagit.org/abakkk/DrawOnYourScreen/issues](https://framagit.org/abakkk/DrawOnYourScreen/issues) to say it doesn't work
+7. [https://codeberg.org/som/DrawOnYourScreen/issues](https://codeberg.org/som/DrawOnYourScreen/issues) to say it doesn't work

 ## Tips and tricks

@ -32,25 +32,25 @@ Then save your beautiful work by taking a screenshot.

 The `Ctrl` key provides an extra functionality for each tool.

- ![Range of Ctrl key possibilities](https://framagit.org/abakkk/DrawOnYourScreen/-/raw/media/ctrl.webm)
+ [Range of Ctrl key possibilities](https://codeberg.org/som/DrawOnYourScreen/src/branch/media/ctrl.webm)

 * Draw arrows:

 Intersect two lines and curve the second thanks to the `Ctrl` key.

- ![How to draw an arrow](https://framagit.org/abakkk/DrawOnYourScreen/uploads/af8f96d33cfeff49bb922a1ef9f4a4ce/arrow-screencast.webm)
+ [How to draw an arrow](https://codeberg.org/som/DrawOnYourScreen/src/branch/media/arrow.webm)

 * Duplicate an element:

 Hold the `Shift` key while starting moving.
 
- ![How to duplicate an element](https://framagit.org/abakkk/DrawOnYourScreen/-/raw/media/duplicate.webm)
+ [How to duplicate an element](https://codeberg.org/som/DrawOnYourScreen/src/branch/media/duplicate.webm)

 * Insertable images:

- You can insert images (jpeg, png, svg) in your drawings. By default images are sought in `~/.local/share/drawOnYourScreen/images/` but the location is configurable in the preferences. Another way is to copy-past the images from Nautilus or any clipboard source by using the usual `Ctrl + V` shortcut inside the drawing mode.
+ You can insert images (jpeg, png, svg) in your drawings. By default images are sought in `~/.local/share/draw-on-your-screen/images/` but the location is configurable in the preferences. Another way is to copy-past the images from Nautilus or any clipboard source by using the usual `Ctrl + V` shortcut inside the drawing mode.
 
- ![How to add images from Nautilus](https://framagit.org/abakkk/DrawOnYourScreen/-/raw/media/ctrl-plus-v.webm)
+ [How to add images from Nautilus](https://codeberg.org/som/DrawOnYourScreen/src/branch/media/ctrl-plus-v.webm)

 * Eraser and SVG:

@ -64,5 +64,5 @@ Then save your beautiful work by taking a screenshot.

 If the GNOME Shell built-in color picker is too basic for you, have a look at the [Color Picker extension](https://extensions.gnome.org/extension/3396/color-picker), which let's you select the pixel accurately, preview the color and adjust its values. Once installed and enabled, it will be transparently integrated into DrawOnYourScreen.

- ![Color Picker extension in action](https://framagit.org/abakkk/DrawOnYourScreen/-/raw/media/color-picker-extension.jpg)
+ ![Color Picker extension in action](https://codeberg.org/som/DrawOnYourScreen/raw/branch/media/color-picker-extension.jpg)

--- a/area.js
+++ b/area.js
@ -1,15 +1,9 @@
-/* jslint esversion: 6 */
-/* exported Tools, DrawingArea */
-
 /*
 * Copyright 2019 Abakkk
 *
- * This file is part of DrawOnYourScreen, a drawing extension for GNOME Shell.
- * https://framagit.org/abakkk/DrawOnYourScreen
- *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * 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,
@ -19,8 +13,14 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * SPDX-FileCopyrightText: 2019 Abakkk
+ * SPDX-License-Identifier: GPL-3.0-or-later
 */

+/* jslint esversion: 6 */
+/* exported Tool, DrawingArea */
+
 const Cairo = imports.cairo;
 const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
@ -48,21 +48,22 @@ const pgettext = imports.gettext.domain(Me.metadata['gettext-domain']).pgettext;
 const MOTION_TIME = 1; // ms, time accuracy for free drawing, max is about 33 ms. The lower it is, the smoother the drawing is.
 const TEXT_CURSOR_TIME = 600; // ms
 const ELEMENT_GRABBER_TIME = 80; // ms, default is about 16 ms
+const TOGGLE_ANIMATION_DURATION = 300; // ms
 const GRID_TILES_HORIZONTAL_NUMBER = 30;
 const COLOR_PICKER_EXTENSION_UUID = 'color-picker@tuberry'; 
 const UUID = Me.uuid.replace(/@/gi, '_at_').replace(/[^a-z0-9+_-]/gi, '_');

-const { Shapes, Transformations } = Elements;
+const { Shape, TextAlignment, Transformation } = Elements;
 const { DisplayStrings } = Menu;

 const FontGenericFamilies = ['Sans-Serif', 'Serif', 'Monospace', 'Cursive', 'Fantasy'];
-const Manipulations = { MOVE: 100, RESIZE: 101, MIRROR: 102 };
-var Tools = Object.assign({
+const Manipulation = { MOVE: 100, RESIZE: 101, MIRROR: 102 };
+var Tool = Object.assign({
    getNameOf: function(value) {
        return Object.keys(this).find(key => this[key] == value);
    }
-}, Shapes, Manipulations);
-Object.defineProperty(Tools, 'getNameOf', { enumerable: false });
+}, Shape, Manipulation);
+Object.defineProperty(Tool, 'getNameOf', { enumerable: false });

 // toJSON provides a string suitable for SVG color attribute whereas
 // toString provides a string suitable for displaying the color name to the user.
@ -143,14 +144,15 @@ var DrawingArea = new Lang.Class({
        this.layerContainer.add_child(this.foreLayer);
        this.gridLayer = new DrawingLayer(this._repaintGrid.bind(this));
        this.gridLayer.hide();
+        this.gridLayer.opacity = 0;
        this.layerContainer.add_child(this.gridLayer);
        
        this.elements = [];
        this.undoneElements = [];
        this.currentElement = null;
-        this.currentTool = Shapes.NONE;
+        this.currentTool = Shape.NONE;
        this.currentImage = null;
-        this.currentTextRightAligned = Clutter.get_default_text_direction() == Clutter.TextDirection.RTL;
+        this.currentTextAlignment = Clutter.get_default_text_direction() == Clutter.TextDirection.RTL ? TextAlignment.RIGHT : TextAlignment.LEFT;
        let fontName = St.Settings && St.Settings.get().font_name || Convenience.getSettings('org.gnome.desktop.interface').get_string('font-name');
        this.currentFont = Pango.FontDescription.from_string(fontName);
        this.currentFont.unset_fields(Pango.FontMask.SIZE);
@ -176,7 +178,7 @@ var DrawingArea = new Lang.Class({
    
    get menu() {
        if (!this._menu)
-            this._menu = new Menu.DrawingMenu(this, this.monitor, Tools, this.areaManagerUtils);
+            this._menu = new Menu.DrawingMenu(this, this.monitor, Tool, this.areaManagerUtils);
        return this._menu;
    },
    
@ -249,7 +251,7 @@ var DrawingArea = new Lang.Class({
    
    get hasManipulationTool() {
        // No Object.values method in GS 3.24.
-        return Object.keys(Manipulations).map(key => Manipulations[key]).indexOf(this.currentTool) != -1;
+        return Object.keys(Manipulation).map(key => Manipulation[key]).indexOf(this.currentTool) != -1;
    },
    
    // Boolean wrapper for switch menu item.
@ -315,25 +317,26 @@ var DrawingArea = new Lang.Class({
        for (let i = 0; i < this.elements.length; i++) {
            cr.save();
            
-            this.elements[i].buildCairo(cr, { showTextRectangle: this.grabbedElement && this.grabbedElement == this.elements[i],
-                                              drawTextRectangle: this.grabPoint ? true : false });
+            this.elements[i].buildCairo(cr, { showElementBounds: this.grabbedElement && this.grabbedElement == this.elements[i],
+                                              drawElementBounds: this.grabPoint ? true : false });
            
            if (this.grabPoint)
                this._searchElementToGrab(cr, this.elements[i]);
            
            if (this.elements[i].fill && !this.elements[i].isStraightLine) {
                cr.fillPreserve();
-                if (this.elements[i].shape == Shapes.NONE || this.elements[i].shape == Shapes.LINE)
+                if (this.elements[i].shape == Shape.NONE || this.elements[i].shape == Shape.LINE)
                    cr.closePath();
            } 
            
            cr.stroke();
+            this.elements[i]._addMarks(cr);
            cr.restore();
        }
        
        if (this.currentElement && this.currentElement.eraser) {
            this.currentElement.buildCairo(cr, { showTextCursor: this.textHasCursor,
-                                                 showTextRectangle: this.currentElement.shape != Shapes.TEXT || !this.isWriting,
+                                                 showElementBounds: this.currentElement.shape != Shape.TEXT || !this.isWriting,
                                                 dummyStroke: this.currentElement.fill && this.currentElement.line.lineWidth == 0 });
            cr.stroke();
        }
@ -344,7 +347,7 @@ var DrawingArea = new Lang.Class({
            return;
        
        this.currentElement.buildCairo(cr, { showTextCursor: this.textHasCursor,
-                                             showTextRectangle: this.currentElement.shape != Shapes.TEXT || !this.isWriting,
+                                             showElementBounds: this.currentElement.shape != Shape.TEXT || !this.isWriting,
                                             dummyStroke: this.currentElement.fill && this.currentElement.line.lineWidth == 0 });
        cr.stroke();
    },
@ -377,11 +380,11 @@ var DrawingArea = new Lang.Class({
    },
    
    _getHasImageBack: function() {
-        return this.elements.some(element => element.shape == Shapes.IMAGE);
+        return this.elements.some(element => element.shape == Shape.IMAGE);
    },
    
    _getHasImageFore: function() {
-        return this.currentElement && this.currentElement.shape == Shapes.IMAGE || false;
+        return this.currentElement && this.currentElement.shape == Shape.IMAGE || false;
    },
    
    _redisplay: function() {
@ -409,7 +412,7 @@ var DrawingArea = new Lang.Class({
        let controlPressed = event.has_control_modifier();
        let shiftPressed = event.has_shift_modifier();
        
-        if (this.currentElement && this.currentElement.shape == Shapes.TEXT && this.isWriting)
+        if (this.currentElement && this.currentElement.shape == Shape.TEXT && this.isWriting)
            // finish writing
            this._stopWriting();
        
@ -469,7 +472,7 @@ var DrawingArea = new Lang.Class({
    },
    
    _onKeyPressed: function(actor, event) {
-        if (this.currentElement && this.currentElement.shape == Shapes.LINE &&
+        if (this.currentElement && this.currentElement.shape == Shape.LINE &&
            (event.get_key_symbol() == Clutter.KEY_Return ||
             event.get_key_symbol() == Clutter.KEY_KP_Enter ||
             event.get_key_symbol() == Clutter.KEY_Control_L)) {
@ -483,7 +486,7 @@ var DrawingArea = new Lang.Class({
            this._redisplay();
            return Clutter.EVENT_STOP;
        } else if (this.currentElement &&
-                   (this.currentElement.shape == Shapes.POLYGON || this.currentElement.shape == Shapes.POLYLINE) &&
+                   (this.currentElement.shape == Shape.POLYGON || this.currentElement.shape == Shape.POLYLINE) &&
                   (event.get_key_symbol() == Clutter.KEY_Return || event.get_key_symbol() == Clutter.KEY_KP_Enter)) {
            
            this.currentElement.addPoint();
@ -558,7 +561,7 @@ var DrawingArea = new Lang.Class({
        if (!success)
            return;
        
-        if (this.currentTool == Manipulations.MIRROR) {
+        if (this.currentTool == Manipulation.MIRROR) {
            this.grabbedElementLocked = !this.grabbedElementLocked;
            if (this.grabbedElementLocked) {
                this.updatePointerCursor();
@ -589,12 +592,12 @@ var DrawingArea = new Lang.Class({
        
        let undoable = !duplicate;
        
-        if (this.currentTool == Manipulations.MOVE)
-            this.grabbedElement.startTransformation(startX, startY, controlPressed ? Transformations.ROTATION : Transformations.TRANSLATION, undoable);
-        else if (this.currentTool == Manipulations.RESIZE)
-            this.grabbedElement.startTransformation(startX, startY, controlPressed ? Transformations.STRETCH : Transformations.SCALE_PRESERVE, undoable);
-         else if (this.currentTool == Manipulations.MIRROR) {
-            this.grabbedElement.startTransformation(startX, startY, controlPressed ? Transformations.INVERSION : Transformations.REFLECTION, undoable);
+        if (this.currentTool == Manipulation.MOVE)
+            this.grabbedElement.startTransformation(startX, startY, controlPressed ? Transformation.ROTATION : Transformation.TRANSLATION, undoable);
+        else if (this.currentTool == Manipulation.RESIZE)
+            this.grabbedElement.startTransformation(startX, startY, controlPressed ? Transformation.STRETCH : Transformation.SCALE_PRESERVE, undoable);
+         else if (this.currentTool == Manipulation.MIRROR) {
+            this.grabbedElement.startTransformation(startX, startY, controlPressed ? Transformation.INVERSION : Transformation.REFLECTION, undoable);
            this._redisplay();
        }
        
@ -614,28 +617,28 @@ var DrawingArea = new Lang.Class({
    _updateTransforming: function(x, y, controlPressed) {
        let undoable = this.grabbedElement.lastTransformation.undoable || false;
        
-        if (controlPressed && this.grabbedElement.lastTransformation.type == Transformations.TRANSLATION) {
+        if (controlPressed && this.grabbedElement.lastTransformation.type == Transformation.TRANSLATION) {
            this.grabbedElement.stopTransformation();
-            this.grabbedElement.startTransformation(x, y, Transformations.ROTATION, undoable);
-        } else if (!controlPressed && this.grabbedElement.lastTransformation.type == Transformations.ROTATION) {
+            this.grabbedElement.startTransformation(x, y, Transformation.ROTATION, undoable);
+        } else if (!controlPressed && this.grabbedElement.lastTransformation.type == Transformation.ROTATION) {
            this.grabbedElement.stopTransformation();
-            this.grabbedElement.startTransformation(x, y, Transformations.TRANSLATION, undoable);
+            this.grabbedElement.startTransformation(x, y, Transformation.TRANSLATION, undoable);
        }
        
-        if (controlPressed && this.grabbedElement.lastTransformation.type == Transformations.SCALE_PRESERVE) {
+        if (controlPressed && this.grabbedElement.lastTransformation.type == Transformation.SCALE_PRESERVE) {
            this.grabbedElement.stopTransformation();
-            this.grabbedElement.startTransformation(x, y, Transformations.STRETCH, undoable);
-        } else if (!controlPressed && this.grabbedElement.lastTransformation.type == Transformations.STRETCH) {
+            this.grabbedElement.startTransformation(x, y, Transformation.STRETCH, undoable);
+        } else if (!controlPressed && this.grabbedElement.lastTransformation.type == Transformation.STRETCH) {
            this.grabbedElement.stopTransformation();
-            this.grabbedElement.startTransformation(x, y, Transformations.SCALE_PRESERVE, undoable);
+            this.grabbedElement.startTransformation(x, y, Transformation.SCALE_PRESERVE, undoable);
        }
        
-        if (controlPressed && this.grabbedElement.lastTransformation.type == Transformations.REFLECTION) {
+        if (controlPressed && this.grabbedElement.lastTransformation.type == Transformation.REFLECTION) {
            this.grabbedElement.transformations.pop();
-            this.grabbedElement.startTransformation(x, y, Transformations.INVERSION, undoable);
-        } else if (!controlPressed && this.grabbedElement.lastTransformation.type == Transformations.INVERSION) {
+            this.grabbedElement.startTransformation(x, y, Transformation.INVERSION, undoable);
+        } else if (!controlPressed && this.grabbedElement.lastTransformation.type == Transformation.INVERSION) {
            this.grabbedElement.transformations.pop();
-            this.grabbedElement.startTransformation(x, y, Transformations.REFLECTION, undoable);
+            this.grabbedElement.startTransformation(x, y, Transformation.REFLECTION, undoable);
        }
        
        this.grabbedElement.updateTransformation(x, y);
@ -667,7 +670,7 @@ var DrawingArea = new Lang.Class({
            this._stopDrawing();
        });
        
-        if (this.currentTool == Shapes.TEXT) {
+        if (this.currentTool == Shape.TEXT) {
            this.currentElement = new Elements.DrawingElement({
                shape: this.currentTool,
                color: this.currentColor,
@ -675,10 +678,10 @@ var DrawingArea = new Lang.Class({
                font: this.currentFont.copy(),
                // Translators: initial content of the text area
                text: pgettext("text-area-content", "Text"),
-                textRightAligned: this.currentTextRightAligned,
+                textAlignment: this.currentTextAlignment,
                points: []
            });
-        } else if (this.currentTool == Shapes.IMAGE) {
+        } else if (this.currentTool == Shape.IMAGE) {
            this.currentElement = new Elements.DrawingElement({
                shape: this.currentTool,
                color: this.currentColor,
@ -701,8 +704,8 @@ var DrawingArea = new Lang.Class({
        
        this.currentElement.startDrawing(startX, startY);
        
-        if (this.currentTool == Shapes.POLYGON || this.currentTool == Shapes.POLYLINE) {
-            let icon = Files.Icons[this.currentTool == Shapes.POLYGON ? 'TOOL_POLYGON' : 'TOOL_POLYLINE'];
+        if (this.currentTool == Shape.POLYGON || this.currentTool == Shape.POLYLINE) {
+            let icon = Files.Icons[this.currentTool == Shape.POLYGON ? 'TOOL_POLYGON' : 'TOOL_POLYLINE'];
            // Translators: %s is a key label
            this.emit('show-osd', icon, _("Press <i>%s</i> to mark vertices")
                                        .format(Gtk.accelerator_get_label(Clutter.KEY_Return, 0)), "", -1, true);
@ -725,16 +728,24 @@ var DrawingArea = new Lang.Class({
            let controlPressed = event.has_control_modifier();
            this._updateDrawing(x, y, controlPressed);
            
-            if (this.currentTool == Shapes.NONE) {
+            if (this.currentTool == Shape.NONE) {
                let device = event.get_device();
                let sequence = event.get_event_sequence();
                
                // Minimum time between two motion events is about 33 ms.
                // Add intermediate points to make quick free drawings smoother.
                this.motionTimeout = GLib.timeout_add(GLib.PRIORITY_DEFAULT, MOTION_TIME, () => {
-                    let [success, coords] = device.get_coords(sequence);
-                    if (!success)
-                        return GLib.SOURCE_CONTINUE;
+                    let success, coords;
+                    if (device.get_coords) {
+                        [success, coords] = device.get_coords(sequence);
+                        if (!success)
+                            return GLib.SOURCE_CONTINUE;
+                    } else {
+                        // GS 40+, device.get_coords() has been removed
+                        // and seat.query_state() is unusable with null sequences.
+                        let pointer = global.get_pointer();
+                        coords = { x: pointer[0], y: pointer[1] };
+                    }
                    
                    let [s, x, y] = this._transformStagePoint(coords.x, coords.y);
                    if (!s)
@ -779,14 +790,14 @@ var DrawingArea = new Lang.Class({
        }
        
        // skip when a polygon has not at least 3 points
-        if (this.currentElement && this.currentElement.shape == Shapes.POLYGON && this.currentElement.points.length < 3)
+        if (this.currentElement && this.currentElement.shape == Shape.POLYGON && this.currentElement.points.length < 3)
            this.currentElement = null;
        
        if (this.currentElement)
            this.currentElement.stopDrawing();
        
        if (this.currentElement && this.currentElement.points.length >= 2) {
-            if (this.currentElement.shape == Shapes.TEXT && !this.isWriting) {
+            if (this.currentElement.shape == Shape.TEXT && !this.isWriting) {
                this._startWriting();
                return;
            }
@ -806,12 +817,14 @@ var DrawingArea = new Lang.Class({
        this.currentElement.cursorPosition = 0;
        // Translators: %s is a key label
        this.emit('show-osd', Files.Icons.TOOL_TEXT, _("Press <i>%s</i>\nto start a new line")
-                                                     .format(Gtk.accelerator_get_label(Clutter.KEY_Return, 1)), "", -1, true);
+                                                     .format(Gtk.accelerator_get_label(Clutter.KEY_Return, 0)), "", -1, true);
        this._updateTextCursorTimeout();
        this.textHasCursor = true;
        this._redisplay();
        
-        // Do not hide and do not set opacity to 0 because ibusCandidatePopup need a mapped text entry to init correctly its position.
+        // Do not hide and do not set opacity to 0 because:
+        // 1. ibusCandidatePopup need a mapped text entry to init correctly its position.
+        // 2. 'cursor-changed' signal is no emitted if the text entry is not visible.
        this.textEntry = new St.Entry({ opacity: 1, x: stageX + x, y: stageY + y });
        this.insert_child_below(this.textEntry, null);
        this.textEntry.grab_key_focus();
@ -830,74 +843,47 @@ var DrawingArea = new Lang.Class({
            this.textEntry.connect('destroy', () => ibusCandidatePopup.disconnect(this.ibusHandler));
        }
        
-        this.textEntry.clutterText.connect('activate', (clutterText) => {
-            this._stopWriting();
+        this.textEntry.clutterText.set_single_line_mode(false);
+        this.textEntry.clutterText.set_activatable(false);
+        
+        let showCursorOnPositionChanged = true;
+        this.textEntry.clutterText.connect('text-changed', clutterText => {
+            this.textEntry.y = stageY + y + (this.textEntry.clutterText.get_layout().get_line_count() - 1) * this.currentElement.height;
+            this.currentElement.text = clutterText.text;
+            showCursorOnPositionChanged = false;
+            this._redisplay();
        });
        
-        this.textEntry.clutterText.connect('text-changed', (clutterText) => {
-            GLib.idle_add(GLib.PRIORITY_DEFAULT_IDLE, () => {
-                this.currentElement.text = clutterText.text;
-                this.currentElement.cursorPosition = clutterText.cursorPosition;
-                this._updateTextCursorTimeout();
-                this._redisplay();
-            });
+        this.textEntry.clutterText.connect('cursor-changed', clutterText => {
+            this.currentElement.cursorPosition = clutterText.cursorPosition;
+            this._updateTextCursorTimeout();
+            let cursorPosition = clutterText.cursorPosition == -1 ? clutterText.text.length : clutterText.cursorPosition;
+            this.textHasCursor = showCursorOnPositionChanged || GLib.unichar_isspace(clutterText.text.charAt(cursorPosition - 1));
+            showCursorOnPositionChanged = true;
+            this._redisplay();
        });
        
        this.textEntry.clutterText.connect('key-press-event', (clutterText, event) => {
            if (event.get_key_symbol() == Clutter.KEY_Escape) {
-                this.currentElement.text = "";
                this._stopWriting();
                return Clutter.EVENT_STOP;
-            } else if (event.has_shift_modifier() &&
-                       (event.get_key_symbol() == Clutter.KEY_Return ||
-                        event.get_key_symbol() == Clutter.KEY_KP_Enter)) {
-                let startNewLine = true;
-                this._stopWriting(startNewLine);
-                clutterText.text = "";
-                return Clutter.EVENT_STOP;
-            }
-            
-            // 'cursor-changed' signal is not emitted if the text entry is not visible.
-            // So key events related to the cursor must be listened.
-            if (event.get_key_symbol() == Clutter.KEY_Left || event.get_key_symbol() == Clutter.KEY_Right ||
-                event.get_key_symbol() == Clutter.KEY_Home || event.get_key_symbol() == Clutter.KEY_End) {
-                GLib.idle_add(GLib.PRIORITY_DEFAULT_IDLE, () => {
-                    this.currentElement.cursorPosition = clutterText.cursorPosition;
-                    this._updateTextCursorTimeout();
-                    this.textHasCursor = true;
-                    this._redisplay();
-                });
            }
            
            return Clutter.EVENT_PROPAGATE;
        });
    },
    
-    _stopWriting: function(startNewLine) {
+    _stopWriting: function() {
        if (this.currentElement.text.length > 0)
            this.elements.push(this.currentElement);
            
-        if (startNewLine && this.currentElement.points.length == 2) {
-            this.currentElement.lineIndex = this.currentElement.lineIndex || 0;
-            // copy object, the original keep existing in this.elements
-            this.currentElement = Object.create(this.currentElement);
-            this.currentElement.lineIndex ++;
-            // define a new 'points' array, the original keep existing in this.elements
-            this.currentElement.points = [
-                [this.currentElement.points[0][0], this.currentElement.points[0][1] + this.currentElement.height],
-                [this.currentElement.points[1][0], this.currentElement.points[1][1] + this.currentElement.height]
-            ];
-            this.currentElement.text = "";
-            this.textEntry.set_y(this.currentElement.y);
-        } else {
-            this.currentElement = null;
-            this._stopTextCursorTimeout();
-            this.textEntry.destroy();
-            delete this.textEntry;
-            this.grab_key_focus();
-            this.updateActionMode();
-            this.updatePointerCursor();
-        }
+        this.currentElement = null;
+        this._stopTextCursorTimeout();
+        this.textEntry.destroy();
+        delete this.textEntry;
+        this.grab_key_focus();
+        this.updateActionMode();
+        this.updatePointerCursor();
        
        this._redisplay();
    },
@ -910,15 +896,15 @@ var DrawingArea = new Lang.Class({
    },
    
    updatePointerCursor: function(controlPressed) {
-        if (this.currentTool == Manipulations.MIRROR && this.grabbedElementLocked)
+        if (this.currentTool == Manipulation.MIRROR && this.grabbedElementLocked)
            this.setPointerCursor('CROSSHAIR');
        else if (this.hasManipulationTool)
            this.setPointerCursor(this.grabbedElement ? 'MOVE_OR_RESIZE_WINDOW' : 'DEFAULT');
-        else if (this.currentElement && this.currentElement.shape == Shapes.TEXT && this.isWriting)
+        else if (this.currentElement && this.currentElement.shape == Shape.TEXT && this.isWriting)
            this.setPointerCursor('IBEAM');
        else if (!this.currentElement)
-            this.setPointerCursor(this.currentTool == Shapes.NONE ? 'POINTING_HAND' : 'CROSSHAIR');
-        else if (this.currentElement.shape != Shapes.NONE && controlPressed)
+            this.setPointerCursor(this.currentTool == Shape.NONE ? 'POINTING_HAND' : 'CROSSHAIR');
+        else if (this.currentElement.shape != Shape.NONE && controlPressed)
            this.setPointerCursor('MOVE_OR_RESIZE_WINDOW');
    },
    
@ -1007,7 +993,7 @@ var DrawingArea = new Lang.Class({
    },
    
    smoothLastElement: function() {
-        if (this.elements.length > 0 && this.elements[this.elements.length - 1].shape == Shapes.NONE) {
+        if (this.elements.length > 0 && this.elements[this.elements.length - 1].shape == Shape.NONE) {
            this.elements[this.elements.length - 1].smoothAll();
            this._redisplay();
        }
@ -1015,7 +1001,16 @@ var DrawingArea = new Lang.Class({
    
    toggleBackground: function() {
        this.hasBackground = !this.hasBackground;
-        this.set_background_color(this.hasBackground ? this.areaBackgroundColor : null);
+        let backgroundColor = this.hasBackground ? this.areaBackgroundColor : Clutter.Color.get_static(Clutter.StaticColor.TRANSPARENT);
+        
+        if (this.ease) {
+            this.remove_all_transitions();
+            this.ease({ backgroundColor,
+                        duration: TOGGLE_ANIMATION_DURATION,
+                        transition: Clutter.AnimationMode.EASE_IN_OUT_QUAD });
+        } else {
+            this.set_background_color(backgroundColor);
+        }
    },
    
    get hasGrid() {
@ -1024,19 +1019,43 @@ var DrawingArea = new Lang.Class({
    
    toggleGrid: function() {
        // The grid layer is repainted when the visibility changes.
-        this.gridLayer.visible = !this.gridLayer.visible;
+        if (this.gridLayer.ease) {
+            this.gridLayer.remove_all_transitions();
+            let visible = !this.gridLayer.visible;
+            this.gridLayer.visible = true;
+            this.gridLayer.ease({ opacity: visible ? 255 : 0,
+                                  duration: TOGGLE_ANIMATION_DURATION,
+                                  transition: Clutter.AnimationMode.EASE_IN_OUT_QUAD,
+                                  onStopped: () => this.gridLayer.visible = visible });
+        } else {
+            this.gridLayer.visible = !this.gridLayer.visible;
+        }
    },
    
    toggleSquareArea: function() {
        this.isSquareArea = !this.isSquareArea;
+        let x, y, width, height, onComplete;
+        
        if (this.isSquareArea) {
-            this.layerContainer.set_position((this.monitor.width - this.squareAreaSize) / 2, (this.monitor.height - this.squareAreaSize) / 2);
-            this.layerContainer.set_size(this.squareAreaSize, this.squareAreaSize);
            this.layerContainer.add_style_class_name('draw-on-your-screen-square-area');
+            [x, y] = [(this.monitor.width - this.squareAreaSize) / 2, (this.monitor.height - this.squareAreaSize) / 2];
+            width = height = this.squareAreaSize;
+            onComplete = () => {};
        } else {
-            this.layerContainer.set_position(0, 0);
-            this.layerContainer.set_size(this.monitor.width, this.monitor.height);
-            this.layerContainer.remove_style_class_name('draw-on-your-screen-square-area');
+            x = y = 0;
+            [width, height] = [this.monitor.width, this.monitor.height];
+            onComplete = () => this.layerContainer.remove_style_class_name('draw-on-your-screen-square-area');
+        }
+        
+        if (this.layerContainer.ease) {
+            this.layerContainer.remove_all_transitions();
+            this.layerContainer.ease({ x, y, width, height, onComplete,
+                                       duration: TOGGLE_ANIMATION_DURATION,
+                                       transition: Clutter.AnimationMode.EASE_OUT_QUAD });
+        } else {
+            this.layerContainer.set_position(x, y);
+            this.layerContainer.set_size(width, height);
+            onComplete();
        }
    },
    
@ -1055,7 +1074,7 @@ var DrawingArea = new Lang.Class({
    
    selectTool: function(tool) {
        this.currentTool = tool;
-        this.emit('show-osd', Files.Icons[`TOOL_${Tools.getNameOf(tool)}`] || null, DisplayStrings.Tool[tool], "", -1, false);
+        this.emit('show-osd', Files.Icons[`TOOL_${Tool.getNameOf(tool)}`] || null, DisplayStrings.Tool[tool], "", -1, false);
        this.updatePointerCursor();
    },
    
@ -1137,13 +1156,13 @@ var DrawingArea = new Lang.Class({
    },
    
    switchTextAlignment: function() {
-        this.currentTextRightAligned = !this.currentTextRightAligned;
-        if (this.currentElement && this.currentElement.textRightAligned !== undefined) {
-            this.currentElement.textRightAligned = this.currentTextRightAligned;
+        this.currentTextAlignment = this.currentTextAlignment == 2 ? 0 : this.currentTextAlignment + 1;
+        if (this.currentElement && this.currentElement.textAlignment != this.currentTextAlignment) {
+            this.currentElement.textAlignment = this.currentTextAlignment;
            this._redisplay();
        }
-        let icon = Files.Icons[this.currentTextRightAligned ? 'RIGHT_ALIGNED' : 'LEFT_ALIGNED'];
-        this.emit('show-osd', icon, DisplayStrings.getTextAlignment(this.currentTextRightAligned), "", -1, false);
+        let icon = Files.Icons[this.currentTextAlignment == TextAlignment.RIGHT ? 'RIGHT_ALIGNED' : this.currentTextAlignment == TextAlignment.CENTER ? 'CENTERED' : 'LEFT_ALIGNED'];
+        this.emit('show-osd', icon, DisplayStrings.TextAlignment[this.currentTextAlignment], "", -1, false);
    },
    
    switchImageFile: function(reverse) {
@ -1155,7 +1174,7 @@ var DrawingArea = new Lang.Class({
    pasteImageFiles: function() {
        Files.Images.addImagesFromClipboard(lastImage => {
            this.currentImage = lastImage;
-            this.currentTool = Shapes.IMAGE;
+            this.currentTool = Shape.IMAGE;
            this.updatePointerCursor();
            this.emit('show-osd', this.currentImage.gicon, this.currentImage.toString(), "", -1, false);
        });
@ -1355,7 +1374,7 @@ var DrawingArea = new Lang.Class({
        this._stopAll();
        
        let prefixes = 'xmlns="http://www.w3.org/2000/svg"';
-        if (this.elements.some(element => element.shape == Shapes.IMAGE))
+        if (this.elements.some(element => element.shape == Shape.IMAGE))
            prefixes += ' xmlns:xlink="http://www.w3.org/1999/xlink"';
        let content = `<svg viewBox="0 0 ${this.layerContainer.width} ${this.layerContainer.height}" ${prefixes}>`;
        let backgroundColorString = this.hasBackground ? String(this.areaBackgroundColor) : 'transparent';
--- a/elements.js
+++ b/elements.js
@ -1,15 +1,9 @@
-/* jslint esversion: 6 */
-/* exported Shapes, Transformations, getAllFontFamilies, DrawingElement */
-
 /*
 * Copyright 2019 Abakkk
 *
- * This file is part of DrawOnYourScreen, a drawing extension for GNOME Shell.
- * https://framagit.org/abakkk/DrawOnYourScreen
- *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * 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,
@ -19,8 +13,14 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * SPDX-FileCopyrightText: 2019 Abakkk
+ * SPDX-License-Identifier: GPL-3.0-or-later
 */

+/* jslint esversion: 6 */
+/* exported Shape, TextAlignment, Transformation, getAllFontFamilies, DrawingElement */
+
 const Cairo = imports.cairo;
 const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;
@ -30,8 +30,9 @@ const PangoCairo = imports.gi.PangoCairo;
 const Me = imports.misc.extensionUtils.getCurrentExtension();
 const UUID = Me.uuid.replace(/@/gi, '_at_').replace(/[^a-z0-9+_-]/gi, '_');

-var Shapes = { NONE: 0, LINE: 1, ELLIPSE: 2, RECTANGLE: 3, TEXT: 4, POLYGON: 5, POLYLINE: 6, IMAGE: 7 };
-var Transformations = { TRANSLATION: 0, ROTATION: 1, SCALE_PRESERVE: 2, STRETCH: 3, REFLECTION: 4, INVERSION: 5, SMOOTH: 100 };
+var Shape = { NONE: 0, LINE: 1, ELLIPSE: 2, RECTANGLE: 3, TEXT: 4, POLYGON: 5, POLYLINE: 6, IMAGE: 7 };
+var TextAlignment = { LEFT: 0, CENTER: 1, RIGHT: 2 };
+var Transformation = { TRANSLATION: 0, ROTATION: 1, SCALE_PRESERVE: 2, STRETCH: 3, REFLECTION: 4, INVERSION: 5, SMOOTH: 100 };

 var getAllFontFamilies = function() {
    return PangoCairo.font_map_get_default().list_families().map(fontFamily => fontFamily.get_name()).sort((a,b) => a.localeCompare(b));
@ -63,10 +64,11 @@ const MIN_TRANSLATION_DISTANCE = 1;         // px
 const MIN_ROTATION_ANGLE = Math.PI / 1000;  // rad
 const MIN_DRAWING_SIZE = 3;                 // px
 const MIN_INTERMEDIATE_POINT_DISTANCE = 1;  // px, the higher it is, the fewer points there will be
+const MARK_COLOR = Clutter.Color.get_static(Clutter.StaticColor.BLUE);

 var DrawingElement = function(params) {
-    return params.shape == Shapes.TEXT ? new TextElement(params) :
-           params.shape == Shapes.IMAGE ? new ImageElement(params) :
+    return params.shape == Shape.TEXT ? new TextElement(params) :
+           params.shape == Shape.IMAGE ? new ImageElement(params) :
           new _DrawingElement(params);
 };

@ -103,14 +105,19 @@ const _DrawingElement = new Lang.Class({
        if (params.transform && params.transform.center) {
            let angle = (params.transform.angle || 0) + (params.transform.startAngle || 0);
            if (angle)
-                this.transformations.push({ type: Transformations.ROTATION, angle: angle });
+                this.transformations.push({ type: Transformation.ROTATION, angle: angle });
        }
-        if (params.shape == Shapes.ELLIPSE && params.transform && params.transform.ratio && params.transform.ratio != 1 && params.points.length >= 2) {
+        if (params.shape == Shape.ELLIPSE && params.transform && params.transform.ratio && params.transform.ratio != 1 && params.points.length >= 2) {
            let [ratio, p0, p1] = [params.transform.ratio, params.points[0], params.points[1]];
            // Add a fake point that will give the right ellipse ratio when building the element.
            this.points.push([ratio * (p1[0] - p0[0]) + p0[0], ratio * (p1[1] - p0[1]) + p0[1]]);
        }
        delete this.transform;
+        
+        // v10-
+        if (this.textRightAligned)
+            this.textAlignment = TextAlignment.RIGHT;
+        delete this.textRightAligned;
    },
    
    // toJSON is called by JSON.stringify
@ -123,7 +130,7 @@ const _DrawingElement = new Lang.Class({
            fill: this.fill,
            fillRule: this.fillRule,
            eraser: this.eraser,
-            transformations: this.transformations.filter(transformation => transformation.type != Transformations.SMOOTH)
+            transformations: this.transformations.filter(transformation => transformation.type != Transformation.SMOOTH)
                                                 .map(transformation => Object.assign({}, transformation, { undoable: undefined })),
            points: this.points.map((point) => [Math.round(point[0]*100)/100, Math.round(point[1]*100)/100])
        };
@ -133,18 +140,6 @@ const _DrawingElement = new Lang.Class({
        if (this.color)
            Clutter.cairo_set_source_color(cr, this.color);
        
-        if (this.showSymmetryElement) {
-            let transformation = this.lastTransformation;
-            setDummyStroke(cr);
-            if (transformation.type == Transformations.REFLECTION) {
-                cr.moveTo(transformation.startX, transformation.startY);
-                cr.lineTo(transformation.endX, transformation.endY);
-            } else {
-                cr.arc(transformation.endX, transformation.endY, INVERSION_CIRCLE_RADIUS, 0, 2 * Math.PI);
-            }
-            cr.stroke();
-        }
-        
        if (this.line) {
            cr.setLineCap(this.line.lineCap);
            cr.setLineJoin(this.line.lineJoin);
@ -171,21 +166,21 @@ const _DrawingElement = new Lang.Class({
        }
        
        this.transformations.slice(0).reverse().forEach(transformation => {
-            if (transformation.type == Transformations.TRANSLATION) {
+            if (transformation.type == Transformation.TRANSLATION) {
                cr.translate(transformation.slideX, transformation.slideY);
-            } else if (transformation.type == Transformations.ROTATION) {
+            } else if (transformation.type == Transformation.ROTATION) {
                let center = this._getTransformedCenter(transformation);
                cr.translate(center[0], center[1]);
                cr.rotate(transformation.angle);
                cr.translate(-center[0], -center[1]);
-            } else if (transformation.type == Transformations.SCALE_PRESERVE || transformation.type == Transformations.STRETCH) {
+            } else if (transformation.type == Transformation.SCALE_PRESERVE || transformation.type == Transformation.STRETCH) {
                let center = this._getTransformedCenter(transformation);
                cr.translate(center[0], center[1]);
                cr.rotate(transformation.angle);
                cr.scale(transformation.scaleX, transformation.scaleY);
                cr.rotate(-transformation.angle);
                cr.translate(-center[0], -center[1]);
-            } else if (transformation.type == Transformations.REFLECTION || transformation.type == Transformations.INVERSION) {
+            } else if (transformation.type == Transformation.REFLECTION || transformation.type == Transformation.INVERSION) {
                cr.translate(transformation.slideX, transformation.slideY);
                cr.rotate(transformation.angle);
                cr.scale(transformation.scaleX, transformation.scaleY);
@ -199,24 +194,61 @@ const _DrawingElement = new Lang.Class({
        cr.identityMatrix();
    },
    
+    _addMarks: function(cr) {
+        if (this.showSymmetryElement) {
+            setDummyStroke(cr);
+            Clutter.cairo_set_source_color(cr, MARK_COLOR);
+            
+            let transformation = this.lastTransformation;
+            if (transformation.type == Transformation.REFLECTION) {
+                cr.moveTo(transformation.startX, transformation.startY);
+                cr.lineTo(transformation.endX, transformation.endY);
+            } else {
+                cr.arc(transformation.endX, transformation.endY, INVERSION_CIRCLE_RADIUS, 0, 2 * Math.PI);
+            }
+            cr.stroke();
+        }
+        
+        if (this.showRotationCenter) {
+            setDummyStroke(cr);
+            Clutter.cairo_set_source_color(cr, MARK_COLOR);
+            
+            let center = this._getTransformedCenter(this.lastTransformation);
+            cr.arc(center[0], center[1], INVERSION_CIRCLE_RADIUS, 0, 2 * Math.PI);
+            cr.stroke();
+        }
+        
+        if (this.showStretchAxes) {
+            setDummyStroke(cr);
+            Clutter.cairo_set_source_color(cr, MARK_COLOR);
+            
+            let center = this._getTransformedCenter(this.lastTransformation);
+            for (let i = 0; i <=1; i++) {
+                cr.moveTo(center[0] - 1000 * Math.cos(i * Math.PI / 2), center[1] - 1000 * Math.sin(i * Math.PI / 2));
+                cr.lineTo(center[0] + 1000 * Math.cos(i * Math.PI / 2), center[1] + 1000 * Math.sin(i * Math.PI / 2));
+            }
+            cr.stroke();
+        }
+    },
+    
    _drawCairo: function(cr, params) {
        let [points, shape] = [this.points, this.shape];
        
-        if (shape == Shapes.LINE && points.length == 3) {
+        if (shape == Shape.LINE && points.length == 3) {
            cr.moveTo(points[0][0], points[0][1]);
            cr.curveTo(points[0][0], points[0][1], points[1][0], points[1][1], points[2][0], points[2][1]);
            
-        } else if (shape == Shapes.LINE && points.length == 4) {
+        } else if (shape == Shape.LINE && points.length == 4) {
            cr.moveTo(points[0][0], points[0][1]);
            cr.curveTo(points[1][0], points[1][1], points[2][0], points[2][1], points[3][0], points[3][1]);
            
-        } else if (shape == Shapes.NONE || shape == Shapes.LINE) {
+        } else if (shape == Shape.NONE || shape == Shape.LINE) {
            cr.moveTo(points[0][0], points[0][1]);
            for (let j = 1; j < points.length; j++) {
                cr.lineTo(points[j][0], points[j][1]);
            }
            
-        } else if (shape == Shapes.ELLIPSE && points.length >= 2) {
+        } else if (shape == Shape.ELLIPSE && points.length >= 2) {
            let radius = Math.hypot(points[1][0] - points[0][0], points[1][1] - points[0][1]);
            let ratio = 1;
            
@ -232,15 +264,15 @@ const _DrawingElement = new Lang.Class({
            } else
                cr.arc(points[0][0], points[0][1], radius, 0, 2 * Math.PI);
            
-        } else if (shape == Shapes.RECTANGLE && points.length == 2) {
+        } else if (shape == Shape.RECTANGLE && points.length == 2) {
            cr.rectangle(points[0][0], points[0][1], points[1][0] - points[0][0], points[1][1] - points[0][1]);
        
-        } else if ((shape == Shapes.POLYGON || shape == Shapes.POLYLINE) && points.length >= 2) {
+        } else if ((shape == Shape.POLYGON || shape == Shape.POLYLINE) && points.length >= 2) {
            cr.moveTo(points[0][0], points[0][1]);
            for (let j = 1; j < points.length; j++) {
                cr.lineTo(points[j][0], points[j][1]);
            }
-            if (shape == Shapes.POLYGON)
+            if (shape == Shape.POLYGON)
                cr.closePath();
            
        }
@ -262,19 +294,19 @@ const _DrawingElement = new Lang.Class({
        this.transformations.slice(0).reverse().forEach(transformation => {
            let center = this._getTransformedCenter(transformation);
            
-            if (transformation.type == Transformations.TRANSLATION) {
+            if (transformation.type == Transformation.TRANSLATION) {
                transforms.push(['translate', transformation.slideX, transformation.slideY]);
-            } else if (transformation.type == Transformations.ROTATION) {
+            } else if (transformation.type == Transformation.ROTATION) {
                transforms.push(['translate', center[0], center[1]]);
                transforms.push(['rotate', transformation.angle * RADIAN]);
                transforms.push(['translate', -center[0], -center[1]]);
-            } else if (transformation.type == Transformations.SCALE_PRESERVE || transformation.type == Transformations.STRETCH) {
+            } else if (transformation.type == Transformation.SCALE_PRESERVE || transformation.type == Transformation.STRETCH) {
                transforms.push(['translate', center[0], center[1]]);
                transforms.push(['rotate', transformation.angle * RADIAN]);
                transforms.push(['scale', transformation.scaleX, transformation.scaleY]);
                transforms.push(['rotate', -transformation.angle * RADIAN]);
                transforms.push(['translate', -center[0], -center[1]]);
-            } else if (transformation.type == Transformations.REFLECTION || transformation.type == Transformations.INVERSION) {
+            } else if (transformation.type == Transformation.REFLECTION || transformation.type == Transformation.INVERSION) {
                transforms.push(['translate', transformation.slideX, transformation.slideY]);
                transforms.push(['rotate', transformation.angle * RADIAN]);
                transforms.push(['scale', transformation.scaleX, transformation.scaleY]);
@ -342,45 +374,45 @@ const _DrawingElement = new Lang.Class({
                attributes += ` stroke-dasharray="${this.dash.array[0]} ${this.dash.array[1]}" stroke-dashoffset="${this.dash.offset}"`;
        }
        
-        if (this.shape == Shapes.LINE && points.length == 4) {
+        if (this.shape == Shape.LINE && points.length == 4) {
            row += `<path ${attributes} d="M${points[0][0]} ${points[0][1]}`;
            row += ` C ${points[1][0]} ${points[1][1]}, ${points[2][0]} ${points[2][1]}, ${points[3][0]} ${points[3][1]}`;
            row += `${fill ? 'z' : ''}"${transAttribute}/>`;
            
-        } else if (this.shape == Shapes.LINE && points.length == 3) {
+        } else if (this.shape == Shape.LINE && points.length == 3) {
            row += `<path ${attributes} d="M${points[0][0]} ${points[0][1]}`;
            row += ` C ${points[0][0]} ${points[0][1]}, ${points[1][0]} ${points[1][1]}, ${points[2][0]} ${points[2][1]}`;
            row += `${fill ? 'z' : ''}"${transAttribute}/>`;
            
-        } else if (this.shape == Shapes.LINE) {
+        } else if (this.shape == Shape.LINE) {
            row += `<line ${attributes} x1="${points[0][0]}" y1="${points[0][1]}" x2="${points[1][0]}" y2="${points[1][1]}"${transAttribute}/>`;
        
-        } else if (this.shape == Shapes.NONE) {
+        } else if (this.shape == Shape.NONE) {
            row += `<path ${attributes} d="M${points[0][0]} ${points[0][1]}`;
            for (let i = 1; i < points.length; i++)
                row += ` L ${points[i][0]} ${points[i][1]}`;
            row += `${fill ? 'z' : ''}"${transAttribute}/>`;
            
-        } else if (this.shape == Shapes.ELLIPSE && points.length == 3) {
+        } else if (this.shape == Shape.ELLIPSE && points.length == 3) {
            let ry = Math.hypot(points[1][0] - points[0][0], points[1][1] - points[0][1]);
            let rx = Math.hypot(points[2][0] - points[0][0], points[2][1] - points[0][1]);
            row += `<ellipse ${attributes} cx="${points[0][0]}" cy="${points[0][1]}" rx="${rx}" ry="${ry}"${transAttribute}/>`;
            
-        } else if (this.shape == Shapes.ELLIPSE && points.length == 2) {
+        } else if (this.shape == Shape.ELLIPSE && points.length == 2) {
            let r = Math.hypot(points[1][0] - points[0][0], points[1][1] - points[0][1]);
            row += `<circle ${attributes} cx="${points[0][0]}" cy="${points[0][1]}" r="${r}"${transAttribute}/>`;
            
-        } else if (this.shape == Shapes.RECTANGLE && points.length == 2) {
+        } else if (this.shape == Shape.RECTANGLE && points.length == 2) {
            row += `<rect ${attributes} x="${Math.min(points[0][0], points[1][0])}" y="${Math.min(points[0][1], points[1][1])}" ` +
                   `width="${Math.abs(points[1][0] - points[0][0])}" height="${Math.abs(points[1][1] - points[0][1])}"${transAttribute}/>`;
                   
-        } else if (this.shape == Shapes.POLYGON && points.length >= 3) {
+        } else if (this.shape == Shape.POLYGON && points.length >= 3) {
            row += `<polygon ${attributes} points="`;
            for (let i = 0; i < points.length; i++)
                row += ` ${points[i][0]},${points[i][1]}`;
            row += `"${transAttribute}/>`;
        
-        } else if (this.shape == Shapes.POLYLINE && points.length >= 2) {
+        } else if (this.shape == Shape.POLYLINE && points.length >= 2) {
            row += `<polyline ${attributes} points="`;
            for (let i = 0; i < points.length; i++)
                row += ` ${points[i][0]},${points[i][1]}`;
@ -399,7 +431,7 @@ const _DrawingElement = new Lang.Class({
    },
    
    get isStraightLine() {
-        return this.shape == Shapes.LINE && this.points.length == 2;
+        return this.shape == Shape.LINE && this.points.length == 2;
    },
    
    smoothAll: function() {
@ -410,21 +442,21 @@ const _DrawingElement = new Lang.Class({
        
        let newPoints = this.points.slice();
        
-        this.transformations.push({ type: Transformations.SMOOTH, undoable: true,
+        this.transformations.push({ type: Transformation.SMOOTH, undoable: true,
                                    undo: () => this.points = oldPoints,
                                    redo: () => this.points = newPoints });
        
        if (this._undoneTransformations)
-            this._undoneTransformations = this._undoneTransformations.filter(transformation => transformation.type != Transformations.SMOOTH);
+            this._undoneTransformations = this._undoneTransformations.filter(transformation => transformation.type != Transformation.SMOOTH);
    },
    
    addPoint: function() {
-        if (this.shape == Shapes.POLYGON || this.shape == Shapes.POLYLINE) {
+        if (this.shape == Shape.POLYGON || this.shape == Shape.POLYLINE) {
            // copy last point
            let [lastPoint, secondToLastPoint] = [this.points[this.points.length - 1], this.points[this.points.length - 2]];
            if (!getNearness(secondToLastPoint, lastPoint, MIN_DRAWING_SIZE))
                this.points.push([lastPoint[0], lastPoint[1]]);
-        } else if (this.shape == Shapes.LINE) {
+        } else if (this.shape == Shape.LINE) {
            if (this.points.length == 2) {
                this.points[2] = this.points[1];
            } else if (this.points.length == 3) {
@ -448,7 +480,7 @@ const _DrawingElement = new Lang.Class({
    startDrawing: function(startX, startY) {
        this.points.push([startX, startY]);
        
-        if (this.shape == Shapes.POLYGON || this.shape == Shapes.POLYLINE)
+        if (this.shape == Shape.POLYGON || this.shape == Shape.POLYLINE)
            this.points.push([startX, startY]);
    },
    
@ -459,29 +491,29 @@ const _DrawingElement = new Lang.Class({
        
        transform = transform || this.transformations.length >= 1;
        
-        if (this.shape == Shapes.NONE) {
+        if (this.shape == Shape.NONE) {
            points.push([x, y]);
            if (transform)
                this._smooth(points.length - 1);
            
-        } else if ((this.shape == Shapes.RECTANGLE || this.shape == Shapes.POLYGON || this.shape == Shapes.POLYLINE) && transform) {
+        } else if ((this.shape == Shape.RECTANGLE || this.shape == Shape.POLYGON || this.shape == Shape.POLYLINE) && transform) {
            if (points.length < 2)
                return;
                
            let center = this._getOriginalCenter();
-            this.transformations[0] = { type: Transformations.ROTATION,
+            this.transformations[0] = { type: Transformation.ROTATION,
                                        angle: getAngle(center[0], center[1], points[points.length - 1][0], points[points.length - 1][1], x, y) };
            
-        } else if (this.shape == Shapes.ELLIPSE && transform) {
+        } else if (this.shape == Shape.ELLIPSE && transform) {
            if (points.length < 2)
                return;
            
            points[2] = [x, y];
            let center = this._getOriginalCenter();
-            this.transformations[0] = { type: Transformations.ROTATION,
+            this.transformations[0] = { type: Transformation.ROTATION,
                                        angle: getAngle(center[0], center[1], center[0] + 1, center[1], x, y) };
            
-        } else if (this.shape == Shapes.POLYGON || this.shape == Shapes.POLYLINE) {
+        } else if (this.shape == Shape.POLYGON || this.shape == Shape.POLYLINE) {
            points[points.length - 1] = [x, y];
            
        } else {
@ -492,51 +524,55 @@ const _DrawingElement = new Lang.Class({
    
    stopDrawing: function() {
        // skip when the size is too small to be visible (3px) (except for free drawing)
-        if (this.shape != Shapes.NONE && this.points.length >= 2) {
+        if (this.shape != Shape.NONE && this.points.length >= 2) {
            let lastPoint = this.points[this.points.length - 1];
            let secondToLastPoint = this.points[this.points.length - 2];
            if (getNearness(secondToLastPoint, lastPoint, MIN_DRAWING_SIZE))
                this.points.pop();
        }
        
-        if (this.transformations[0] && this.transformations[0].type == Transformations.ROTATION &&
+        if (this.transformations[0] && this.transformations[0].type == Transformation.ROTATION &&
                Math.abs(this.transformations[0].angle) < MIN_ROTATION_ANGLE)
            this.transformations.shift();
    },
    
    startTransformation: function(startX, startY, type, undoable) {
-        if (type == Transformations.TRANSLATION)
+        if (type == Transformation.TRANSLATION)
            this.transformations.push({ startX, startY, type, undoable, slideX: 0, slideY: 0 });
-        else if (type == Transformations.ROTATION)
+        else if (type == Transformation.ROTATION)
            this.transformations.push({ startX, startY, type, undoable, angle: 0 });
-        else if (type == Transformations.SCALE_PRESERVE || type == Transformations.STRETCH)
+        else if (type == Transformation.SCALE_PRESERVE || type == Transformation.STRETCH)
            this.transformations.push({ startX, startY, type, undoable, scaleX: 1, scaleY: 1, angle: 0 });
-        else if (type == Transformations.REFLECTION)
+        else if (type == Transformation.REFLECTION)
            this.transformations.push({ startX, startY, endX: startX, endY: startY, type, undoable,
                                        scaleX:  1, scaleY:  1, slideX: 0, slideY: 0, angle: 0 });
-        else if (type == Transformations.INVERSION)
+        else if (type == Transformation.INVERSION)
            this.transformations.push({ startX, startY, endX: startX, endY: startY, type, undoable,
                                        scaleX: -1, scaleY: -1, slideX: startX, slideY: startY,
                                        angle: Math.PI + Math.atan(startY / (startX || 1)) });
        
-        if (type == Transformations.REFLECTION || type == Transformations.INVERSION)
+        if (type == Transformation.REFLECTION || type == Transformation.INVERSION)
            this.showSymmetryElement = true;
+        else if (type == Transformation.ROTATION)
+            this.showRotationCenter = true;
+        else if (type == Transformation.STRETCH)
+            this.showStretchAxes = true;
    },
    
    updateTransformation: function(x, y) {
        let transformation = this.lastTransformation;
        
-        if (transformation.type == Transformations.TRANSLATION) {
+        if (transformation.type == Transformation.TRANSLATION) {
            transformation.slideX = x - transformation.startX;
            transformation.slideY = y - transformation.startY;
-        } else if (transformation.type == Transformations.ROTATION) {
+        } else if (transformation.type == Transformation.ROTATION) {
            let center = this._getTransformedCenter(transformation);
            transformation.angle = getAngle(center[0], center[1], transformation.startX, transformation.startY, x, y);
-        } else if (transformation.type == Transformations.SCALE_PRESERVE) {
+        } else if (transformation.type == Transformation.SCALE_PRESERVE) {
            let center = this._getTransformedCenter(transformation);
            let scale = Math.hypot(x - center[0], y - center[1]) / Math.hypot(transformation.startX - center[0], transformation.startY - center[1]) || 1;
            [transformation.scaleX, transformation.scaleY] = [scale, scale];
-        } else if (transformation.type == Transformations.STRETCH) {
+        } else if (transformation.type == Transformation.STRETCH) {
            let center = this._getTransformedCenter(transformation);
            let startAngle = getAngle(center[0], center[1], center[0] + 1, center[1], transformation.startX, transformation.startY);
            let vertical = Math.abs(Math.sin(startAngle)) >= Math.sin(Math.PI / 2 - STRETCH_TOLERANCE);
@ -545,7 +581,7 @@ const _DrawingElement = new Lang.Class({
            transformation.scaleX = vertical ? 1 : scale;
            transformation.scaleY = !vertical ? 1 : scale;
            transformation.angle = vertical || horizontal ? 0 : getAngle(center[0], center[1], center[0] + 1, center[1], x, y);
-        } else if (transformation.type == Transformations.REFLECTION) {
+        } else if (transformation.type == Transformation.REFLECTION) {
            [transformation.endX, transformation.endY] = [x, y];
            if (getNearness([transformation.startX, transformation.startY], [x, y], MIN_REFLECTION_LINE_LENGTH)) {
                // do nothing to avoid jumps (no transformation at starting and locked transformation after)
@ -568,7 +604,7 @@ const _DrawingElement = new Lang.Class({
                [transformation.slideX, transformation.slideY] = [transformation.startX - transformation.startY * tan, 0];
                transformation.angle = Math.PI - Math.atan(tan);
            }
-        } else if (transformation.type == Transformations.INVERSION) {
+        } else if (transformation.type == Transformation.INVERSION) {
            [transformation.endX, transformation.endY] = [x, y];
            [transformation.scaleX, transformation.scaleY] = [-1, -1];
            [transformation.slideX, transformation.slideY] = [x, y];
@ -578,16 +614,18 @@ const _DrawingElement = new Lang.Class({
    
    stopTransformation: function() {
        this.showSymmetryElement = false;
+        this.showRotationCenter = false;
+        this.showStretchAxes = false;
        
        // Clean transformations
        let transformation = this.lastTransformation;
        if (!transformation)
            return;
        
-        if (transformation.type == Transformations.REFLECTION &&
+        if (transformation.type == Transformation.REFLECTION &&
                getNearness([transformation.startX, transformation.startY], [transformation.endX, transformation.endY], MIN_REFLECTION_LINE_LENGTH) ||
-            transformation.type == Transformations.TRANSLATION && Math.hypot(transformation.slideX, transformation.slideY) < MIN_TRANSLATION_DISTANCE ||
-            transformation.type == Transformations.ROTATION && Math.abs(transformation.angle) < MIN_ROTATION_ANGLE) {
+            transformation.type == Transformation.TRANSLATION && Math.hypot(transformation.slideX, transformation.slideY) < MIN_TRANSLATION_DISTANCE ||
+            transformation.type == Transformation.ROTATION && Math.abs(transformation.angle) < MIN_ROTATION_ANGLE) {
            
            this.transformations.pop();
        } else {
@ -608,7 +646,7 @@ const _DrawingElement = new Lang.Class({
                this._undoneTransformations = [];
            
            let transformation = this.transformations.pop();
-            if (transformation.type == Transformations.SMOOTH)
+            if (transformation.type == Transformation.SMOOTH)
                transformation.undo();
            
            this._undoneTransformations.push(transformation);
@ -625,7 +663,7 @@ const _DrawingElement = new Lang.Class({
                this.transformations = [];
            
            let transformation = this._undoneTransformations.pop();
-            if (transformation.type == Transformations.SMOOTH)
+            if (transformation.type == Transformation.SMOOTH)
                transformation.redo();
            
            this.transformations.push(transformation);
@ -645,13 +683,12 @@ const _DrawingElement = new Lang.Class({
    },
    
    // The figure rotation center before transformations (original).
-    // this.textWidth is computed during Cairo building.
    _getOriginalCenter: function() {
        if (!this._originalCenter) {
            let points = this.points;
-            this._originalCenter = this.shape == Shapes.ELLIPSE ? [points[0][0], points[0][1]] :
-                                   this.shape == Shapes.LINE && points.length == 4 ? getCurveCenter(points[0], points[1], points[2], points[3]) :
-                                   this.shape == Shapes.LINE && points.length == 3 ? getCurveCenter(points[0], points[0], points[1], points[2]) :
+            this._originalCenter = this.shape == Shape.ELLIPSE ? [points[0][0], points[0][1]] :
+                                   this.shape == Shape.LINE && points.length == 4 ? getCurveCenter(points[0], points[1], points[2], points[3]) :
+                                   this.shape == Shape.LINE && points.length == 3 ? getCurveCenter(points[0], points[0], points[1], points[2]) :
                                   points.length >= 3 ? getCentroid(points) :
                                   getNaiveCenter(points);
        }
@ -667,13 +704,13 @@ const _DrawingElement = new Lang.Class({
            // Apply transformations to the matrice in reverse order
            // because Pango multiply matrices by the left when applying a transformation
            this.transformations.slice(0, this.transformations.indexOf(transformation)).reverse().forEach(transformation => {
-                if (transformation.type == Transformations.TRANSLATION) {
+                if (transformation.type == Transformation.TRANSLATION) {
                    matrix.translate(transformation.slideX, transformation.slideY);
-                } else if (transformation.type == Transformations.ROTATION) {
+                } else if (transformation.type == Transformation.ROTATION) {
                    // nothing, the center position is preserved.
-                } else if (transformation.type == Transformations.SCALE_PRESERVE || transformation.type == Transformations.STRETCH) {
+                } else if (transformation.type == Transformation.SCALE_PRESERVE || transformation.type == Transformation.STRETCH) {
                    // nothing, the center position is preserved.
-                } else if (transformation.type == Transformations.REFLECTION || transformation.type == Transformations.INVERSION) {
+                } else if (transformation.type == Transformation.REFLECTION || transformation.type == Transformation.INVERSION) {
                    matrix.translate(transformation.slideX, transformation.slideY);
                    matrix.rotate(-transformation.angle * RADIAN);
                    matrix.scale(transformation.scaleX, transformation.scaleY);
@ -710,8 +747,7 @@ const TextElement = new Lang.Class({
            eraser: this.eraser,
            transformations: this.transformations,
            text: this.text,
-            lineIndex: this.lineIndex !== undefined ? this.lineIndex : undefined,
-            textRightAligned: this.textRightAligned,
+            textAlignment: this.textAlignment,
            font: this.font.to_string(),
            points: this.points.map((point) => [Math.round(point[0]*100)/100, Math.round(point[1]*100)/100])
        };
@ -719,7 +755,11 @@ const TextElement = new Lang.Class({
    
    get x() {
        // this.textWidth is computed during Cairo building.
-        return this.points[1][0] - (this.textRightAligned ? this.textWidth : 0);
+        let offset = this.textAlignment == TextAlignment.RIGHT ? this.textWidth :
+                     this.textAlignment == TextAlignment.CENTER ? this.textWidth / 2 :
+                     0;
+        
+        return this.points[1][0] - offset;
    },
    
    get y() {
@ -730,42 +770,54 @@ const TextElement = new Lang.Class({
        return Math.abs(this.points[1][1] - this.points[0][1]);
    },
    
-    // When rotating grouped lines, lineOffset is used to retrieve the rotation center of the first line.
-    get lineOffset() {
-        return (this.lineIndex || 0) * this.height;
+    // this.lineWidths is computed during Cairo building.
+    _getLineX: function(index) {
+        let offset = this.textAlignment == TextAlignment.RIGHT && this.lineWidths && this.lineWidths[index] ? this.lineWidths[index] :
+                     this.textAlignment == TextAlignment.CENTER && this.lineWidths && this.lineWidths[index] ? this.lineWidths[index] / 2 :
+                     0;
+        
+        return this.points[1][0] - offset;
    },
    
    _drawCairo: function(cr, params) {
-        if (this.points.length == 2) {
-            let layout = PangoCairo.create_layout(cr);
-            let fontSize = this.height * Pango.SCALE;
-            this.font.set_absolute_size(fontSize);
-            layout.set_font_description(this.font);
-            layout.set_text(this.text, -1);
-            this.textWidth = layout.get_pixel_size()[0];
-            cr.moveTo(this.x, this.y);
-            layout.set_text(this.text, -1);
-            PangoCairo.show_layout_line(cr, layout.get_line(0));
+        if (this.points.length != 2)
+            return;
+        
+        let layout = PangoCairo.create_layout(cr);
+        let fontSize = this.height * Pango.SCALE;
+        this.font.set_absolute_size(fontSize);
+        layout.set_font_description(this.font);
+        layout.set_text(this.text, -1);
+        this.textWidth = layout.get_pixel_size()[0];
+        this.lineWidths = layout.get_lines_readonly().map(layoutLine => layoutLine.get_pixel_extents()[1].width);
+        
+        layout.get_lines_readonly().forEach((layoutLine, index) => {
+            cr.moveTo(this._getLineX(index), this.y + this.height * index);
+            PangoCairo.show_layout_line(cr, layoutLine);
+        });
+        
+        // Cannot use 'layout.index_to_line_x(cursorPosition, 0)' because character position != byte index
+        if (params.showTextCursor) {
+            let layoutCopy = layout.copy();
+            if (this.cursorPosition != -1)
+                layoutCopy.set_text(this.text.slice(0, this.cursorPosition), -1);
            
-            if (params.showTextCursor) {
-                let cursorPosition = this.cursorPosition == -1 ? this.text.length : this.cursorPosition;
-                layout.set_text(this.text.slice(0, cursorPosition), -1);
-                let width = layout.get_pixel_size()[0];
-                cr.rectangle(this.x + width, this.y,
-                             this.height / 25, - this.height);
-                cr.fill();
-            }
-            
-            if (params.showTextRectangle) {
-                cr.rectangle(this.x, this.y - this.lineOffset,
-                             this.textWidth, - this.height);
-                setDummyStroke(cr);
-            } else if (params.drawTextRectangle) {
-                cr.rectangle(this.x, this.y,
-                             this.textWidth, - this.height);
-                // Only draw the rectangle to find the element, not to show it.
-                cr.setLineWidth(0);
-            }
+            let cursorLineIndex = layoutCopy.get_line_count() - 1;
+            let cursorX = this._getLineX(cursorLineIndex) + layoutCopy.get_line_readonly(cursorLineIndex).get_pixel_extents()[1].width;
+            let cursorY = this.y + this.height * cursorLineIndex;
+            cr.rectangle(cursorX, cursorY, this.height / 25, - this.height);
+            cr.fill();
+        }
+        
+        if (params.showElementBounds) {
+            cr.rectangle(this.x, this.y - this.height,
+                         this.textWidth, this.height * layout.get_line_count());
+            setDummyStroke(cr);
+        } else if (params.drawElementBounds) {
+            cr.rectangle(this.x, this.y - this.height,
+                         this.textWidth, this.height * layout.get_line_count());
+            // Only draw the rectangle to find the element, not to show it.
+            cr.setLineWidth(0);
        }
    },
    
@ -774,32 +826,48 @@ const TextElement = new Lang.Class({
    },
    
    _drawSvg: function(transAttribute, bgcolorString) {
-        let row = "\n  ";
-        let [x, y, height] = [Math.round(this.x*100)/100, Math.round(this.y*100)/100, Math.round(this.height*100)/100];
+        if (this.points.length != 2)
+            return "";
+        
+        let row = "";
+        let height = Math.round(this.height * 100) / 100;
        let color = this.eraser ? bgcolorString : this.color.toJSON();
        let attributes = this.eraser ? `class="eraser" ` : '';
+        attributes += `fill="${color}" ` +
+                      `font-size="${height}" ` +
+                      `font-family="${this.font.get_family()}"`;
        
-        if (this.points.length == 2) {
-            attributes += `fill="${color}" ` +
-                          `font-size="${height}" ` +
-                          `font-family="${this.font.get_family()}"`;
-            
-            // this.font.to_string() is not valid to fill the svg 'font' shorthand property.
-            // Each property must be filled separately.
-            ['Stretch', 'Style', 'Variant'].forEach(attribute => {
-                let lower = attribute.toLowerCase();
-                if (this.font[`get_${lower}`]() != Pango[attribute].NORMAL) {
-                    let font = new Pango.FontDescription();
-                    font[`set_${lower}`](this.font[`get_${lower}`]());
-                    attributes += ` font-${lower}="${font.to_string()}"`;
-                }
-            });
-            if (this.font.get_weight() != Pango.Weight.NORMAL)
-                attributes += ` font-weight="${this.font.get_weight()}"`;
-            row += `<text ${attributes} x="${x}" `;
-            row += `y="${y}"${transAttribute}>${this.text}</text>`;
+        // this.font.to_string() is not valid to fill the svg 'font' shorthand property.
+        // Each property must be filled separately.
+        ['Stretch', 'Style', 'Variant'].forEach(attribute => {
+            let lower = attribute.toLowerCase();
+            if (this.font[`get_${lower}`]() != Pango[attribute].NORMAL) {
+                let font = new Pango.FontDescription();
+                font[`set_${lower}`](this.font[`get_${lower}`]());
+                attributes += ` font-${lower}="${font.to_string()}"`;
+            }
+        });
+        if (this.font.get_weight() != Pango.Weight.NORMAL)
+            attributes += ` font-weight="${this.font.get_weight()}"`;
+        
+        // It is a fallback for thumbnails. The following layout is not the same than the Cairo one and
+        // layoutLine.get_pixel_extents does not return the correct value with non-latin fonts.
+        // An alternative would be to store this.lineWidths in the json.
+        if (this.textAlignment != TextAlignment.LEFT && !this.lineWidths) {
+            let clutterText = new Clutter.Text({ text: this.text });
+            let layout = clutterText.get_layout();
+            let fontSize = height * Pango.SCALE;
+            this.font.set_absolute_size(fontSize);
+            layout.set_font_description(this.font);
+            this.lineWidths = layout.get_lines_readonly().map(layoutLine => layoutLine.get_pixel_extents()[1].width);
        }
        
+        this.text.split(/\r\n|\r|\n/).forEach((text, index) => {
+            let x = Math.round(this._getLineX(index) * 100) / 100;
+            let y = Math.round((this.y + this.height * index) * 100) / 100;
+            row += `\n <text ${attributes} x="${x}" y="${y}"${transAttribute}>${text}</text>`;
+        });
+        
        return row;
    },
    
@ -827,7 +895,7 @@ const TextElement = new Lang.Class({
    _getOriginalCenter: function() {
        if (!this._originalCenter) {
            let points = this.points;
-            this._originalCenter = this.textWidth ? [points[1][0], Math.max(points[0][1], points[1][1]) - this.lineOffset] :
+            this._originalCenter = points.length == 2 ? [points[1][0], Math.max(points[0][1], points[1][1])] :
                                   points.length >= 3 ? getCentroid(points) :
                                   getNaiveCenter(points);
        }
@ -869,10 +937,10 @@ const ImageElement = new Lang.Class({
        cr.fill();
        cr.restore();
        
-        if (params.showTextRectangle) {
+        if (params.showElementBounds) {
            cr.rectangle(x, y, width, height);
            setDummyStroke(cr);
-        } else if (params.drawTextRectangle) {
+        } else if (params.drawElementBounds) {
            cr.rectangle(x, y, width, height);
            // Only draw the rectangle to find the element, not to show it.
            cr.setLineWidth(0);
--- a/extension.js
+++ b/extension.js
@ -1,15 +1,9 @@
-/* jslint esversion: 6 */
-/* exported init */
-
 /*
 * Copyright 2019 Abakkk
 *
- * This file is part of DrawOnYourScreen, a drawing extension for GNOME Shell.
- * https://framagit.org/abakkk/DrawOnYourScreen
- *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * 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,
@ -19,8 +13,14 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * SPDX-FileCopyrightText: 2019 Abakkk
+ * SPDX-License-Identifier: GPL-3.0-or-later
 */

+/* jslint esversion: 6 */
+/* exported init */
+
 const Lang = imports.lang;
 const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
@ -171,7 +171,7 @@ const AreaManager = new Lang.Class({
            let loadPersistent = i == Main.layoutManager.primaryIndex && this.persistentOverRestarts;
            // Some utils for the drawing area menus.
            let areaManagerUtils = {
-                getHiddenList: () => this.hiddenList,
+                getHiddenList: () => this.hiddenList || null,
                togglePanelAndDockOpacity: this.togglePanelAndDockOpacity.bind(this),
                openPreferences: this.openPreferences.bind(this)
            };
@ -210,17 +210,17 @@ const AreaManager = new Lang.Class({
            'switch-fill' : this.activeArea.switchFill.bind(this.activeArea),
            'switch-image-file' : this.activeArea.switchImageFile.bind(this.activeArea, false),
            'switch-image-file-reverse' : this.activeArea.switchImageFile.bind(this.activeArea, true),
-            'select-none-shape': () => this.activeArea.selectTool(Area.Tools.NONE),
-            'select-line-shape': () => this.activeArea.selectTool(Area.Tools.LINE),
-            'select-ellipse-shape': () => this.activeArea.selectTool(Area.Tools.ELLIPSE),
-            'select-rectangle-shape': () => this.activeArea.selectTool(Area.Tools.RECTANGLE),
-            'select-text-shape': () => this.activeArea.selectTool(Area.Tools.TEXT),
-            'select-image-shape': () => this.activeArea.selectTool(Area.Tools.IMAGE),
-            'select-polygon-shape': () => this.activeArea.selectTool(Area.Tools.POLYGON),
-            'select-polyline-shape': () => this.activeArea.selectTool(Area.Tools.POLYLINE),
-            'select-move-tool': () => this.activeArea.selectTool(Area.Tools.MOVE),
-            'select-resize-tool': () => this.activeArea.selectTool(Area.Tools.RESIZE),
-            'select-mirror-tool': () => this.activeArea.selectTool(Area.Tools.MIRROR)
+            'select-none-shape': () => this.activeArea.selectTool(Area.Tool.NONE),
+            'select-line-shape': () => this.activeArea.selectTool(Area.Tool.LINE),
+            'select-ellipse-shape': () => this.activeArea.selectTool(Area.Tool.ELLIPSE),
+            'select-rectangle-shape': () => this.activeArea.selectTool(Area.Tool.RECTANGLE),
+            'select-text-shape': () => this.activeArea.selectTool(Area.Tool.TEXT),
+            'select-image-shape': () => this.activeArea.selectTool(Area.Tool.IMAGE),
+            'select-polygon-shape': () => this.activeArea.selectTool(Area.Tool.POLYGON),
+            'select-polyline-shape': () => this.activeArea.selectTool(Area.Tool.POLYLINE),
+            'select-move-tool': () => this.activeArea.selectTool(Area.Tool.MOVE),
+            'select-resize-tool': () => this.activeArea.selectTool(Area.Tool.RESIZE),
+            'select-mirror-tool': () => this.activeArea.selectTool(Area.Tool.MIRROR)
        };
        
        // available when writing
--- a/files.js
+++ b/files.js
@ -1,15 +1,9 @@
-/* jslint esversion: 6 */
-/* exported Icons, Image, Images, Json, Jsons, getDateString, saveSvg */
-
 /*
 * Copyright 2019 Abakkk
 *
- * This file is part of DrawOnYourScreen, a drawing extension for GNOME Shell.
- * https://framagit.org/abakkk/DrawOnYourScreen
- *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * 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,
@ -19,8 +13,14 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * SPDX-FileCopyrightText: 2019 Abakkk
+ * SPDX-License-Identifier: GPL-3.0-or-later
 */

+/* jslint esversion: 6 */
+/* exported Icons, Image, Images, Json, Jsons, getDateString, saveSvg */
+
 const ByteArray = imports.byteArray;
 const Gdk = imports.gi.Gdk;
 const GdkPixbuf = imports.gi.GdkPixbuf;
@ -41,13 +41,13 @@ const ICON_NAMES = [
    'arc', 'color', 'dashed-line', 'document-export', 'fillrule-evenodd', 'fillrule-nonzero', 'fill', 'full-line', 'linecap', 'linejoin', 'palette', 'smooth', 'stroke',
    'tool-ellipse', 'tool-line', 'tool-mirror', 'tool-move', 'tool-none', 'tool-polygon', 'tool-polyline', 'tool-rectangle', 'tool-resize',
 ];
-const ThemedIconNames = {
+const ThemedIconName = {
    COLOR_PICKER: 'color-select-symbolic',
    ENTER: 'applications-graphics', LEAVE: 'application-exit',
    GRAB: 'input-touchpad', UNGRAB: 'touchpad-disabled',
    OPEN: 'document-open', SAVE: 'document-save',
    FONT_FAMILY: 'font-x-generic', FONT_STYLE: 'format-text-italic', FONT_WEIGHT:'format-text-bold',
-    LEFT_ALIGNED: 'format-justify-left', RIGHT_ALIGNED: 'format-justify-right',
+    LEFT_ALIGNED: 'format-justify-left', CENTERED: 'format-justify-center',RIGHT_ALIGNED: 'format-justify-right',
    TOOL_IMAGE: 'insert-image', TOOL_TEXT: 'insert-text',
 };

@ -74,11 +74,11 @@ ICON_NAMES.forEach(name => {
    });
 });

-Object.keys(ThemedIconNames).forEach(key => {
+Object.keys(ThemedIconName).forEach(key => {
    Object.defineProperty(Icons, key, {
        get: function() {
            if (!this[`_${key}`])
-                this[`_${key}`] = new Gio.ThemedIcon({ name: `${ThemedIconNames[key]}-symbolic` });
+                this[`_${key}`] = new Gio.ThemedIcon({ name: `${ThemedIconName[key]}-symbolic` });
            return this[`_${key}`];
        }
    });
--- a/gimpPaletteParser.js
+++ b/gimpPaletteParser.js
@ -1,15 +1,9 @@
-/* jslint esversion: 6 */
-/* exported parseFile */
-
 /*
 * Copyright 2019 Abakkk
 *
- * This file is part of DrawOnYourScreen, a drawing extension for GNOME Shell.
- * https://framagit.org/abakkk/DrawOnYourScreen
- *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * 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,
@ -19,8 +13,14 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * SPDX-FileCopyrightText: 2019 Abakkk
+ * SPDX-License-Identifier: GPL-3.0-or-later
 */

+/* jslint esversion: 6 */
+/* exported parseFile */
+
 const ByteArray = imports.byteArray;

 /*
--- a/helper.js
+++ b/helper.js
@ -1,15 +1,9 @@
-/* jslint esversion: 6 */
-/* exported DrawingHelper */
-
 /*
 * Copyright 2019 Abakkk
 *
- * This file is part of DrawOnYourScreen, a drawing extension for GNOME Shell.
- * https://framagit.org/abakkk/DrawOnYourScreen
- *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * 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,
@ -19,8 +13,14 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * SPDX-FileCopyrightText: 2019 Abakkk
+ * SPDX-License-Identifier: GPL-3.0-or-later
 */

+/* jslint esversion: 6 */
+/* exported DrawingHelper */
+
 const Clutter = imports.gi.Clutter;
 const Gtk = imports.gi.Gtk;
 const Lang = imports.lang;
@ -73,8 +73,13 @@ var DrawingHelper = new Lang.Class({
    },
    
    _updateHelpKeyLabel: function() {
-        let [keyval, mods] = Gtk.accelerator_parse(Me.internalShortcutSettings.get_strv('toggle-help')[0] || '');
-        this._helpKeyLabel = Gtk.accelerator_get_label(keyval, mods);
+        try {
+            let [keyval, mods] = Gtk.accelerator_parse(Me.internalShortcutSettings.get_strv('toggle-help')[0] || '');
+            this._helpKeyLabel = Gtk.accelerator_get_label(keyval, mods);
+        } catch(e) {
+            logError(e);
+            this._helpKeyLabel = " ";
+        }
    },
    
    get helpKeyLabel() {
@ -172,10 +177,11 @@ var DrawingHelper = new Lang.Class({
        this.set_position(Math.floor(this.monitor.width / 2 - this.width / 2),
                          Math.floor(this.monitor.height / 2 - this.height / 2));
                          
+        // St.PolicyType: GS 3.32+
        if (this.height == maxHeight)
-            this.vscrollbar_policy = Gtk.PolicyType.ALWAYS;
+            this.vscrollbar_policy = St.PolicyType ? St.PolicyType.ALWAYS : Gtk.PolicyType.ALWAYS;
        else
-            this.vscrollbar_policy = Gtk.PolicyType.NEVER;
+            this.vscrollbar_policy = St.PolicyType ? St.PolicyType.NEVER : Gtk.PolicyType.NEVER;
        
        if (Tweener) {
            Tweener.removeTweens(this);
--- a/locale/POTFILES.in
+++ b/locale/POTFILES.in
@ -1,4 +1,4 @@
-# xgettext --from-code=UTF-8 --add-comments="Translators: " --no-location --package-name="Draw On Your Screen" --msgid-bugs-address="https://framagit.org/abakkk/DrawOnYourScreen/issues" -f locale/POTFILES.in
+# xgettext --from-code=UTF-8 --add-comments="Translators: " --no-location --package-name="Draw On Your Screen" --msgid-bugs-address="https://codeberg.org/som/DrawOnYourScreen/issues" -f locale/POTFILES.in
 area.js
 extension.js
 helper.js
--- a/locale/de/LC_MESSAGES/draw-on-your-screen.mo
+++ b/locale/de/LC_MESSAGES/draw-on-your-screen.mo
--- a/locale/de/LC_MESSAGES/draw-on-your-screen.po
+++ b/locale/de/LC_MESSAGES/draw-on-your-screen.po
@ -2,23 +2,23 @@
 # Copyright (C) 2019 Listed translators
 #
 # This file is distributed under the same license as Draw On Your Screen.
-# Onno Giesmann <nutzer3105@gmail.com>, 2020.
+# Onno Giesmann <nutzer3105@gmail.com>, 2020-2021.
 #
 # Some words refer to SVG attributes (font, line, fill rule ...).
 # You are free to translate them or not.
 msgid ""
 msgstr ""
 "Project-Id-Version: Draw On Your Screen\n"
-"Report-Msgid-Bugs-To: https://framagit.org/abakkk/DrawOnYourScreen/issues\n"
-"POT-Creation-Date: 2020-10-04 22:45+0200\n"
-"PO-Revision-Date: 2020-10-15 13:46+0200\n"
+"Report-Msgid-Bugs-To: https://codeberg.org/som/DrawOnYourScreen/issues\n"
+"POT-Creation-Date: 2021-02-17 14:14+0100\n"
+"PO-Revision-Date: 2021-03-04 08:21+0100\n"
 "Last-Translator: Onno Giesmann <nutzer3105@gmail.com>\n"
 "Language-Team: \n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.4.1\n"
+"X-Generator: Poedit 2.4.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

 #. Translators: %s is a key label
@ -224,13 +224,15 @@ msgstr "Abgeschrägte Ecken"
 msgid "%f px"
 msgstr "%f px"

-#. Translators: text alignment
-msgid "Right aligned"
-msgstr "Rechtsbündig"
-
 msgid "Left aligned"
 msgstr "Linksbündig"

+msgid "Centered"
+msgstr "Zentriert"
+
+msgid "Right aligned"
+msgstr "Rechtsbündig"
+
 msgctxt "drawing-tool"
 msgid "Free drawing"
 msgstr "Freies Zeichnen"
@ -704,8 +706,8 @@ msgstr "Linien-Kappenstil ändern"
 msgid "Change linejoin"
 msgstr "Linienverbindung ändern"

-msgid "Toggle text alignment"
-msgstr "Textausrichtung umschalten"
+msgid "Change text alignment"
+msgstr "Textausrichtung ändern"

 msgid "Add a drawing background"
 msgstr "Zeichnungshintergrund hinzufügen"
@ -736,4 +738,4 @@ msgstr "Rückgängig"
 #~ msgstr "Letzten Pinselstrich wiederherstellen"

 #~ msgid "Undo last brushstroke"
-#~ msgstr "Letzten Pinselstrich wieder entfernen"
+#~ msgstr "Letzten Pinselstrich wieder entfernen"
--- a/locale/draw-on-your-screen.pot
+++ b/locale/draw-on-your-screen.pot
@ -9,8 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Draw On Your Screen\n"
-"Report-Msgid-Bugs-To: https://framagit.org/abakkk/DrawOnYourScreen/issues\n"
-"POT-Creation-Date: 2020-10-04 22:45+0200\n"
+"Report-Msgid-Bugs-To: https://codeberg.org/som/DrawOnYourScreen/issues\n"
+"POT-Creation-Date: 2021-02-17 14:14+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@ -44,7 +44,9 @@ msgstr ""

 #. Translators: %s is a key label
 #, javascript-format
-msgid "Press <i>%s</i>\nto start a new line"
+msgid ""
+"Press <i>%s</i>\n"
+"to start a new line"
 msgstr ""

 #. Translators: It is displayed in an OSD notification to ask the user to start picking, so it should use the imperative mood.
@ -214,11 +216,13 @@ msgstr ""
 msgid "%f px"
 msgstr ""

-#. Translators: text alignment
-msgid "Right aligned"
+msgid "Left aligned"
 msgstr ""

-msgid "Left aligned"
+msgid "Centered"
+msgstr ""
+
+msgid "Right aligned"
 msgstr ""

 msgctxt "drawing-tool"
@ -685,7 +689,7 @@ msgstr ""
 msgid "Change linejoin"
 msgstr ""

-msgid "Toggle text alignment"
+msgid "Change text alignment"
 msgstr ""

 msgid "Add a drawing background"
--- a/locale/fr/LC_MESSAGES/draw-on-your-screen.mo
+++ b/locale/fr/LC_MESSAGES/draw-on-your-screen.mo
--- a/locale/fr/LC_MESSAGES/draw-on-your-screen.po
+++ b/locale/fr/LC_MESSAGES/draw-on-your-screen.po
@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Draw On Your Screen 6.1\n"
-"Report-Msgid-Bugs-To: https://framagit.org/abakkk/DrawOnYourScreen/issues\n"
-"POT-Creation-Date: 2020-09-19 15:32+0200\n"
-"PO-Revision-Date: 2020-10-21 09:23+0200\n"
+"Report-Msgid-Bugs-To: https://codeberg.org/som/DrawOnYourScreen/issues\n"
+"POT-Creation-Date: 2021-02-17 14:14+0100\n"
+"PO-Revision-Date: 2021-02-20 01:06+0100\n"
 "Last-Translator: Abakkk\n"
 "Language-Team: \n"
 "Language: fr\n"
@ -226,13 +226,15 @@ msgstr "Biseauté"
 msgid "%f px"
 msgstr "%f px"

-#. Translators: text alignment
-msgid "Right aligned"
-msgstr "Aligné à droite"
-
 msgid "Left aligned"
 msgstr "Aligné à gauche"

+msgid "Centered"
+msgstr "Centré"
+
+msgid "Right aligned"
+msgstr "Aligné à droite"
+
 msgctxt "drawing-tool"
 msgid "Free drawing"
 msgstr "Dessin libre"
@ -277,12 +279,6 @@ msgctxt "drawing-tool"
 msgid "Mirror"
 msgstr "Miroir"

-msgid "Undo"
-msgstr "Retirer"
-
-msgid "Redo"
-msgstr "Rétablir"
-
 msgid "Erase"
 msgstr "Effacer"

@ -349,7 +345,7 @@ msgstr ""
 #. "<a href=\"mailto:translator2@mail.org\">translator2</a>\n"
 #. "<a href=\"https://...\">translator3</a>"
 msgid "translator-credits"
-msgstr "<a href=\"https://framagit.org/abakkk\">Abakkk</a>"
+msgstr "<a href=\"https://codeberg.org/abak\">Abakkk</a>"

 msgid "Palettes"
 msgstr "Palettes"
@ -601,8 +597,8 @@ msgstr "Ouvrir le dessin précédent"
 msgid "Add images from the clipboard"
 msgstr "Ajouter des images depuis le presse-papiers"

-msgid "Redo last brushstroke"
-msgstr "Rétablir le dernier tracé"
+msgid "Redo"
+msgstr "Rétablir"

 msgid "Save drawing"
 msgstr "Enregistrer le dessin"
@ -706,8 +702,8 @@ msgstr "Modifier la forme de l’extrémité des lignes"
 msgid "Change linejoin"
 msgstr "Modifier la jointure des segments de ligne"

-msgid "Toggle text alignment"
-msgstr "Alterner l’alignement du texte"
+msgid "Change text alignment"
+msgstr "Modifier l’alignement du texte"

 msgid "Add a drawing background"
 msgstr "Ajouter une couleur de fond au dessin"
@ -725,5 +721,5 @@ msgstr "Cacher le panneau et le dock"
 msgid "Square drawing area"
 msgstr "Rendre la zone de dessin carrée"

-msgid "Undo last brushstroke"
-msgstr "Retirer le dernier tracé"
+msgid "Undo"
+msgstr "Retirer"
--- a/locale/it_IT/LC_MESSAGES/draw-on-your-screen.mo
+++ b/locale/it_IT/LC_MESSAGES/draw-on-your-screen.mo
--- a/locale/it_IT/LC_MESSAGES/draw-on-your-screen.po
+++ b/locale/it_IT/LC_MESSAGES/draw-on-your-screen.po
@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Draw On Your Desktop\n"
-"Report-Msgid-Bugs-To: https://framagit.org/abakkk/DrawOnYourScreen/issues\n"
+"Report-Msgid-Bugs-To: https://codeberg.org/som/DrawOnYourScreen/issues\n"
 "POT-Creation-Date: 2020-03-06 18:46+0100\n"
 "PO-Revision-Date: 2020-03-06 19:05+0100\n"
 "Language-Team: Albano Battistella <albano_battistella@hotmail.com>\n"
--- a/locale/ru/LC_MESSAGES/draw-on-your-screen.mo
+++ b/locale/ru/LC_MESSAGES/draw-on-your-screen.mo
--- a/locale/ru/LC_MESSAGES/draw-on-your-screen.po
+++ b/locale/ru/LC_MESSAGES/draw-on-your-screen.po
@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Draw On Your Screen VERSION\n"
-"Report-Msgid-Bugs-To: https://framagit.org/abakkk/DrawOnYourScreen/issues\n"
+"Report-Msgid-Bugs-To: https://codeberg.org/som/DrawOnYourScreen/issues\n"
 "POT-Creation-Date: 2019-03-04 16:40+0100\n"
 "PO-Revision-Date: 2019-10-17 17:54+0300\n"
 "Language-Team: \n"
--- a/locale/zh_CN/LC_MESSAGES/draw-on-your-screen.mo
+++ b/locale/zh_CN/LC_MESSAGES/draw-on-your-screen.mo
--- a/locale/zh_CN/LC_MESSAGES/draw-on-your-screen.po
+++ b/locale/zh_CN/LC_MESSAGES/draw-on-your-screen.po
@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Draw On Your Screen\n"
-"Report-Msgid-Bugs-To: https://framagit.org/abakkk/DrawOnYourScreen/issues\n"
+"Report-Msgid-Bugs-To: https://codeberg.org/som/DrawOnYourScreen/issues\n"
 "POT-Creation-Date: 2020-09-19 15:32+0200\n"
 "PO-Revision-Date: 2020-09-20 16:00+0800\n"
 "Last-Translator: tuberry <tuberry@example.com>\n"
--- a/menu.js
+++ b/menu.js
@ -1,15 +1,9 @@
-/* jslint esversion: 6 */
-/* exported DisplayStrings, DrawingMenu */
-
 /*
 * Copyright 2019 Abakkk
 *
- * This file is part of DrawOnYourScreen, a drawing extension for GNOME Shell.
- * https://framagit.org/abakkk/DrawOnYourScreen
- *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * 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,
@ -19,8 +13,14 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * SPDX-FileCopyrightText: 2019 Abakkk
+ * SPDX-License-Identifier: GPL-3.0-or-later
 */

+/* jslint esversion: 6 */
+/* exported DisplayStrings, DrawingMenu */
+
 const Clutter = imports.gi.Clutter;
 const GLib = imports.gi.GLib;
 const GObject = imports.gi.GObject;
@ -47,6 +47,7 @@ const FONT_FAMILY_STYLE = true;
 // use 'login-dialog-message-warning' class in order to get GS theme warning color (default: #f57900)
 const WARNING_COLOR_STYLE_CLASS_NAME = 'login-dialog-message-warning';
 const UUID = Me.uuid.replace(/@/gi, '_at_').replace(/[^a-z0-9+_-]/gi, '_');
+const TextAlignmentIcon = { 0: Files.Icons.LEFT_ALIGNED, 1: Files.Icons.CENTERED, 2: Files.Icons.RIGHT_ALIGNED };

 const getActor = function(object) {
    return GS_VERSION < '3.33.0' ? object.actor : object;
@ -71,52 +72,52 @@ var DisplayStrings = {
    },
    
    get FillRule() {
-        if (!this._fillRules)
+        if (!this._FillRule)
            // Translators: fill-rule SVG attribute
-            this._fillRules = { 0: _("Nonzero"), 1: _("Evenodd") };
-        return this._fillRules;
+            this._FillRule = { 0: _("Nonzero"), 1: _("Evenodd") };
+        return this._FillRule;
    },
    
    getFontFamily: function(family) {
-        if (!this._fontGenericFamilies)
+        if (!this._FontGenericFamily)
            // Translators: generic font-family SVG attribute
-            this._fontGenericFamilies = { 'Sans-Serif': pgettext("font-family", "Sans-Serif"), 'Serif': pgettext("font-family", "Serif"),
-                                          'Monospace': pgettext("font-family", "Monospace"), 'Cursive': pgettext("font-family", "Cursive"),
-                                          'Fantasy': pgettext("font-family", "Fantasy") };
-        return this._fontGenericFamilies[family] || family;
+            this._FontGenericFamily = { 'Sans-Serif': pgettext("font-family", "Sans-Serif"), 'Serif': pgettext("font-family", "Serif"),
+                                        'Monospace': pgettext("font-family", "Monospace"), 'Cursive': pgettext("font-family", "Cursive"),
+                                        'Fantasy': pgettext("font-family", "Fantasy") };
+        return this._FontGenericFamily[family] || family;
    },
    
    get FontStyle() {
-        if (!this._fontStyles)
+        if (!this._FontStyle)
            // Translators: font-style SVG attribute
-            this._fontStyles = { 0: pgettext("font-style", "Normal"), 1: pgettext("font-style", "Oblique"), 2: pgettext("font-style", "Italic") };
-        return this._fontStyles;
+            this._FontStyle = { 0: pgettext("font-style", "Normal"), 1: pgettext("font-style", "Oblique"), 2: pgettext("font-style", "Italic") };
+        return this._FontStyle;
    },
    
    FontStyleMarkup: { 0: 'normal', 1: 'oblique', 2: 'italic' },
    
    get FontWeight() {
-        if (!this._fontWeights)
+        if (!this._FontWeight)
            // Translators: font-weight SVG attribute
-            this._fontWeights = { 100: pgettext("font-weight", "Thin"), 200: pgettext("font-weight", "Ultra Light"), 300: pgettext("font-weight", "Light"),
-                                  350: pgettext("font-weight", "Semi Light"), 380: pgettext("font-weight", "Book"), 400: pgettext("font-weight", "Normal"),
-                                  500: pgettext("font-weight", "Medium"), 600: pgettext("font-weight", "Semi Bold"), 700: pgettext("font-weight", "Bold"),
-                                  800: pgettext("font-weight", "Ultra Bold"), 900: pgettext("font-weight", "Heavy"), 1000: pgettext("font-weight", "Ultra Heavy") };
-        return this._fontWeights;
+            this._FontWeight = { 100: pgettext("font-weight", "Thin"), 200: pgettext("font-weight", "Ultra Light"), 300: pgettext("font-weight", "Light"),
+                                 350: pgettext("font-weight", "Semi Light"), 380: pgettext("font-weight", "Book"), 400: pgettext("font-weight", "Normal"),
+                                 500: pgettext("font-weight", "Medium"), 600: pgettext("font-weight", "Semi Bold"), 700: pgettext("font-weight", "Bold"),
+                                 800: pgettext("font-weight", "Ultra Bold"), 900: pgettext("font-weight", "Heavy"), 1000: pgettext("font-weight", "Ultra Heavy") };
+        return this._FontWeight;
    },
    
    get LineCap() {
-        if (!this._lineCaps)
+        if (!this._LineCap)
            // Translators: stroke-linecap SVG attribute
-            this._lineCaps = { 0: pgettext("stroke-linecap", "Butt"), 1: pgettext("stroke-linecap", "Round"), 2: pgettext("stroke-linecap", "Square") };
-        return this._lineCaps;
+            this._LineCap = { 0: pgettext("stroke-linecap", "Butt"), 1: pgettext("stroke-linecap", "Round"), 2: pgettext("stroke-linecap", "Square") };
+        return this._LineCap;
    },
    
    get LineJoin() {
-        if (!this._lineJoins)
+        if (!this._LineJoin)
            // Translators: stroke-linejoin SVG attribute
-            this._lineJoins = { 0: pgettext("stroke-linejoin", "Miter"), 1: pgettext("stroke-linejoin", "Round"), 2: pgettext("stroke-linejoin", "Bevel") };
-        return this._lineJoins;
+            this._LineJoin = { 0: pgettext("stroke-linejoin", "Miter"), 1: pgettext("stroke-linejoin", "Round"), 2: pgettext("stroke-linejoin", "Bevel") };
+        return this._LineJoin;
    },
    
    getPixels(value) {
@ -124,28 +125,31 @@ var DisplayStrings = {
        return _("%f px").format(value);
    },
    
-    getTextAlignment: function(rightAligned) {
+    get TextAlignment() {
        // Translators: text alignment
-        return rightAligned ? _("Right aligned") : _("Left aligned");
+        if (!this._TextAlignment)
+            this._TextAlignment = { 0: _("Left aligned"), 1: _("Centered"), 2: _("Right aligned") };
+        
+        return this._TextAlignment;
    },
    
    get Tool() {
-        if (!this._tools)
-            this._tools = { 0: pgettext("drawing-tool", "Free drawing"), 1: pgettext("drawing-tool", "Line"), 2: pgettext("drawing-tool", "Ellipse"),
-                            3: pgettext("drawing-tool", "Rectangle"), 4: pgettext("drawing-tool", "Text"), 5: pgettext("drawing-tool", "Polygon"),
-                            6: pgettext("drawing-tool", "Polyline"), 7: pgettext("drawing-tool", "Image"),
-                            100: pgettext("drawing-tool", "Move"), 101: pgettext("drawing-tool", "Resize"), 102: pgettext("drawing-tool", "Mirror") };
-        return this._tools;
+        if (!this._Tool)
+            this._Tool = { 0: pgettext("drawing-tool", "Free drawing"), 1: pgettext("drawing-tool", "Line"), 2: pgettext("drawing-tool", "Ellipse"),
+                           3: pgettext("drawing-tool", "Rectangle"), 4: pgettext("drawing-tool", "Text"), 5: pgettext("drawing-tool", "Polygon"),
+                           6: pgettext("drawing-tool", "Polyline"), 7: pgettext("drawing-tool", "Image"),
+                           100: pgettext("drawing-tool", "Move"), 101: pgettext("drawing-tool", "Resize"), 102: pgettext("drawing-tool", "Mirror") };
+        return this._Tool;
    }
 };

 var DrawingMenu = new Lang.Class({
    Name: `${UUID}-DrawingMenu`,
    
-    _init: function(area, monitor, drawingTools, areaManagerUtils) {
+    _init: function(area, monitor, DrawingTool, areaManagerUtils) {
        this.area = area;
        this.monitor = monitor;
-        this.drawingTools = drawingTools;
+        this.DrawingTool = DrawingTool;
        this.areaManagerUtils = areaManagerUtils;
        
        let side = Clutter.get_default_text_direction() == Clutter.TextDirection.RTL ? St.Side.RIGHT : St.Side.LEFT;
@ -178,7 +182,7 @@ var DrawingMenu = new Lang.Class({
    
    disable: function() {
        delete this.area;
-        delete this.drawingTools;
+        delete this.DrawingTool;
        delete this.areaManagerUtils;
        this.menuManager.removeMenu(this.menu);
        Main.layoutManager.uiGroup.remove_actor(this.menu.actor);
@ -268,7 +272,7 @@ var DrawingMenu = new Lang.Class({
        this._addFontFamilySubMenuItem(fontSection, Files.Icons.FONT_FAMILY);
        this._addSubMenuItem(fontSection, Files.Icons.FONT_WEIGHT, DisplayStrings.FontWeight, this.area, 'currentFontWeight');
        this._addSubMenuItem(fontSection, Files.Icons.FONT_STYLE, DisplayStrings.FontStyle, this.area, 'currentFontStyle');
-        this._addSwitchItem(fontSection, DisplayStrings.getTextAlignment(true), Files.Icons.LEFT_ALIGNED, Files.Icons.RIGHT_ALIGNED, this.area, 'currentTextRightAligned');
+        this._addTextAlignmentSubMenuItem(fontSection);
        this._addSeparator(fontSection);
        this.menu.addMenuItem(fontSection);
        fontSection.itemActivated = () => {};
@ -311,14 +315,14 @@ var DrawingMenu = new Lang.Class({
        this.undoButton.child.reactive = this.area.elements.length > 0;
        this.redoButton.child.reactive = this.area.undoneElements.length > 0 || (this.area.elements.length && this.area.elements[this.area.elements.length - 1].canUndo);
        this.eraseButton.child.reactive = this.area.elements.length > 0;
-        this.smoothButton.child.reactive = this.area.elements.length > 0 && this.area.elements[this.area.elements.length - 1].shape == this.drawingTools.NONE;
+        this.smoothButton.child.reactive = this.area.elements.length > 0 && this.area.elements[this.area.elements.length - 1].shape == this.DrawingTool.NONE;
        this.saveButton.child.reactive = this.area.elements.length > 0;
        this.svgButton.child.reactive = this.area.elements.length > 0;
        this.saveDrawingSubMenuItem.setSensitive(this.area.elements.length > 0);
    },
    
    _updateSectionVisibility: function() {
-        let [isText, isImage] = [this.area.currentTool == this.drawingTools.TEXT, this.area.currentTool == this.drawingTools.IMAGE];
+        let [isText, isImage] = [this.area.currentTool == this.DrawingTool.TEXT, this.area.currentTool == this.DrawingTool.IMAGE];
        this.lineSection.actor.visible = !isText && !isImage;
        this.fontSection.actor.visible = isText;
        this.imageSection.actor.visible = isImage;
@ -421,7 +425,7 @@ var DrawingMenu = new Lang.Class({
        let item = new PopupMenu.PopupSubMenuMenuItem('', true);
        item.update = () => {
            item.label.set_text(DisplayStrings.Tool[this.area.currentTool]);
-            let toolName = this.drawingTools.getNameOf(this.area.currentTool);
+            let toolName = this.DrawingTool.getNameOf(this.area.currentTool);
            item.icon.set_gicon(Files.Icons[`TOOL_${toolName}`]);
        };
        item.update();
@ -431,7 +435,7 @@ var DrawingMenu = new Lang.Class({
        GLib.idle_add(GLib.PRIORITY_DEFAULT_IDLE, () => {
            Object.keys(DisplayStrings.Tool).forEach(key => {
                let text = DisplayStrings.Tool[key];
-                let toolName = this.drawingTools.getNameOf(key);
+                let toolName = this.DrawingTool.getNameOf(key);
                let subItemIcon = Files.Icons[`TOOL_${toolName}`];
                let subItem = item.menu.addAction(text, () => {
                    this.area.currentTool = Number(key);
@ -443,10 +447,10 @@ var DrawingMenu = new Lang.Class({
                getActor(subItem).connect('key-focus-in', updateSubMenuAdjustment);
                
                // change the display order of tools
-                if (key == this.drawingTools.POLYGON)
-                    item.menu.moveMenuItem(subItem, Number(this.drawingTools.TEXT));
-                else if (key == this.drawingTools.POLYLINE)
-                    item.menu.moveMenuItem(subItem, Number(this.drawingTools.TEXT) + 1);
+                if (key == this.DrawingTool.POLYGON)
+                    item.menu.moveMenuItem(subItem, Number(this.DrawingTool.TEXT));
+                else if (key == this.DrawingTool.POLYLINE)
+                    item.menu.moveMenuItem(subItem, Number(this.DrawingTool.TEXT) + 1);
            });
            return GLib.SOURCE_REMOVE;
        });
@ -553,6 +557,28 @@ var DrawingMenu = new Lang.Class({
        menu.addMenuItem(item);
    },
    
+    _addTextAlignmentSubMenuItem: function(menu) {
+        let item = new PopupMenu.PopupSubMenuMenuItem(DisplayStrings.TextAlignment[this.area.currentTextAlignment], true);
+        item.icon.set_gicon(TextAlignmentIcon[this.area.currentTextAlignment]);
+        
+        item.menu.itemActivated = item.menu.close;
+        
+        GLib.idle_add(GLib.PRIORITY_DEFAULT_IDLE, () => {
+            Object.keys(TextAlignmentIcon).forEach(key => {
+                let subItem = item.menu.addAction(DisplayStrings.TextAlignment[key], () => {
+                    item.label.set_text(DisplayStrings.TextAlignment[key]);
+                    this.area.currentTextAlignment = key;
+                    item.icon.set_gicon(TextAlignmentIcon[key]);
+                });
+                
+                getActor(subItem).connect('key-focus-in', updateSubMenuAdjustment);
+            });
+            return GLib.SOURCE_REMOVE;
+        });
+        
+        menu.addMenuItem(item);
+    },
+    
    _addImageSubMenuItem: function(menu, images) {
        let item = new PopupMenu.PopupSubMenuMenuItem('', true);
        item.update = () => {
@ -654,7 +680,7 @@ var DrawingMenu = new Lang.Class({
            let insertCallback = () => {
                this.area.currentImage = json.image;
                this.imageItem.update();
-                this.area.currentTool = this.drawingTools.IMAGE;
+                this.area.currentTool = this.DrawingTool.IMAGE;
                this.toolItem.update();
                this._updateSectionVisibility();
            };
--- a/metadata.json
+++ b/metadata.json
@ -1,11 +1,11 @@
 {
    "name": "Draw On You Screen",
    "description": "Start drawing with Super+Alt+D and save your beautiful work by taking a screenshot",
-    "uuid": "drawOnYourScreen@abakkk.framagit.org",
-    "url": "https://framagit.org/abakkk/DrawOnYourScreen",
+    "uuid": "draw-on-your-screen@som.codeberg.org",
+    "url": "https://codeberg.org/som/DrawOnYourScreen",
    "settings-schema": "org.gnome.shell.extensions.draw-on-your-screen",
    "gettext-domain": "draw-on-your-screen",
-    "data-dir": "drawOnYourScreen",
+    "data-dir": "draw-on-your-screen",
    "persistent-file-name": "persistent",
    "svg-file-name": "DrawOnYourScreen",
    "shell-version": [
@ -16,7 +16,8 @@
        "3.32",
        "3.34",
        "3.36",
-        "3.38"
+        "3.38",
+        "40"
    ],
-    "version": 10
+    "version": 11.1
 }
--- a/prefs.js
+++ b/prefs.js
@ -1,15 +1,9 @@
-/* jslint esversion: 6 */
-/* exported init, buildPrefsWidget */
-
 /*
 * Copyright 2019 Abakkk
 *
- * This file is part of DrawOnYourScreen, a drawing extension for GNOME Shell.
- * https://framagit.org/abakkk/DrawOnYourScreen
- *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * 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,
@ -19,14 +13,20 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * SPDX-FileCopyrightText: 2019 Abakkk
+ * SPDX-License-Identifier: GPL-3.0-or-later
 */

-const Atk = imports.gi.Atk;
+/* jslint esversion: 6 */
+/* exported init, buildPrefsWidget */
+
 const Gdk = imports.gi.Gdk;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const GObject = imports.gi.GObject;
 const Gtk = imports.gi.Gtk;
+const IS_GTK3 = Gtk.get_major_version() == 3;

 const ExtensionUtils = imports.misc.extensionUtils;
 const Me = ExtensionUtils.getCurrentExtension();
@ -39,27 +39,57 @@ const _ = function(string) {
        return "";
    return gettext(string);
 };
-const _GTK = imports.gettext.domain('gtk30').gettext;
+const _GTK = imports.gettext.domain(IS_GTK3 ? 'gtk30' : 'gtk40').gettext;

 const MARGIN = 10;
-const ROWBOX_MARGIN_PARAMS = { margin_top: MARGIN / 2, margin_bottom: MARGIN / 2, margin_left: MARGIN, margin_right: MARGIN };
+const ROWBOX_MARGIN_PARAMS = { margin_top: MARGIN / 2, margin_bottom: MARGIN / 2, margin_start: MARGIN, margin_end: MARGIN, spacing: 4 };
 const UUID = Me.uuid.replace(/@/gi, '_at_').replace(/[^a-z0-9+_-]/gi, '_');

+if (IS_GTK3) {
+    Gtk.Container.prototype.append = Gtk.Container.prototype.add;
+    Gtk.Bin.prototype.set_child = Gtk.Container.prototype.add;
+}
+
+const setAccessibleLabel = function(widget, label) {
+    if (IS_GTK3)
+        widget.get_accessible().set_name(label);
+    else
+        widget.update_property([Gtk.AccessibleProperty.LABEL], [label]);
+};
+
+const setAccessibleDescription = function(widget, description) {
+    if (IS_GTK3)
+        widget.get_accessible().set_description(description);
+    else
+        widget.update_property([Gtk.AccessibleProperty.DESCRIPTION], [description]);
+};
+
+const getChildrenOf = function(widget) {
+    if (IS_GTK3)
+        return widget.get_children();
+    else
+        return [...widget];
+};
+
 function init() {
    Convenience.initTranslations();
 }

 function buildPrefsWidget() {
    let topStack = new TopStack();
-    let switcher = new Gtk.StackSwitcher({halign: Gtk.Align.CENTER, visible: true, stack: topStack});
+    let switcher = new Gtk.StackSwitcher({ halign: Gtk.Align.CENTER, visible: true, stack: topStack });
+    
    GLib.idle_add(GLib.PRIORITY_DEFAULT_IDLE, () => {
-        let window = topStack.get_toplevel();
-        let headerBar = window.get_titlebar();
-        headerBar.custom_title = switcher;
-        return false;
+        if (IS_GTK3)
+            topStack.get_toplevel().get_titlebar().set_custom_title(switcher);
+        else
+            topStack.get_root().get_titlebar().set_title_widget(switcher);
+        
+        return GLib.SOURCE_REMOVE;
    });
    
-    topStack.show_all();
+    if (IS_GTK3)
+        topStack.show_all();
    return topStack;
 }

@ -68,7 +98,8 @@ const TopStack = new GObject.Class({
    Extends: Gtk.Stack,
    
    _init: function(params) {
-        this.parent({ transition_type: 1, transition_duration: 500, expand: true });
+        this.parent({ transition_type: Gtk.StackTransitionType.CROSSFADE, transition_duration: 500, hexpand: true, vexpand: true });
+        
        this.prefsPage = new PrefsPage();
        // Translators: "Preferences" page in preferences
        this.add_titled(this.prefsPage, 'prefs', _("Preferences"));
@ -88,8 +119,8 @@ const AboutPage = new GObject.Class({
    _init: function(params) {
        this.parent({ hscrollbar_policy: Gtk.PolicyType.NEVER });

-        let vbox= new Gtk.Box({ orientation: Gtk.Orientation.VERTICAL, margin: MARGIN * 3 });
-        this.add(vbox);
+        let vbox = new Gtk.Box({ orientation: Gtk.Orientation.VERTICAL, margin_top: 3 * MARGIN, margin_bottom: 3 * MARGIN, margin_start: 3 * MARGIN, margin_end: 3 * MARGIN });
+        this.set_child(vbox);
        
        // Translators: you are free to translate the extension name, that is displayed in About page, or not
        let name = "<b> " + _("Draw On You Screen") + "</b>";
@ -98,25 +129,25 @@ const AboutPage = new GObject.Class({
        // Translators: you are free to translate the extension description, that is displayed in About page, or not
        let description = _("Start drawing with Super+Alt+D and save your beautiful work by taking a screenshot");
        let link = "<span><a href=\"" + Me.metadata.url + "\">" + Me.metadata.url + "</a></span>";
-        let licenceName = _GTK("GNU General Public License, version 2 or later");
-        let licenceLink = "https://www.gnu.org/licenses/old-licenses/gpl-2.0.html";
-        let licence = "<small>" + _GTK("This program comes with absolutely no warranty.\nSee the <a href=\"%s\">%s</a> for details.").format(licenceLink, licenceName) + "</small>";
+        let licenseName = _GTK("GNU General Public License, version 3 or later");
+        let licenseLink = "https://www.gnu.org/licenses/gpl-3.0.html";
+        let license = "<small>" + _GTK("This program comes with absolutely no warranty.\nSee the <a href=\"%s\">%s</a> for details.").format(licenseLink, licenseName) + "</small>";
        
-        let aboutLabel = new Gtk.Label({ wrap: true, justify: 2, use_markup: true, label:
-            name + "\n\n" + version + "\n\n" + description + "\n\n" + link + "\n\n" + licence + "\n" });
+        let aboutLabel = new Gtk.Label({ wrap: true, justify: Gtk.Justification.CENTER, use_markup: true, label:
+            name + "\n\n" + version + "\n\n" + description + "\n\n" + link + "\n\n" + license + "\n" });
        
-        vbox.add(aboutLabel);
+        vbox.append(aboutLabel);
        
-        let creditBox = new Gtk.Box({ orientation: Gtk.Orientation.HORIZONTAL, margin: 2 * MARGIN });
-        let leftBox = new Gtk.Box({ orientation: Gtk.Orientation.VERTICAL });
-        let rightBox = new Gtk.Box({ orientation: Gtk.Orientation.VERTICAL });
-        let leftLabel = new Gtk.Label({ wrap: true, valign: 1, halign: 2, justify: 1, use_markup: true, label: "<small>" + _GTK("Created by") + "</small>" });
-        let rightLabel = new Gtk.Label({ wrap: true, valign: 1, halign: 1, justify: 0, use_markup: true, label: "<small><a href=\"https://framagit.org/abakkk\">Abakkk</a></small>" });
-        leftBox.pack_start(leftLabel, false, false, 0);
-        rightBox.pack_start(rightLabel, false, false, 0);
-        creditBox.pack_start(leftBox, true, true, 5);
-        creditBox.pack_start(rightBox, true, true, 5);
-        vbox.add(creditBox);
+        let creditBox = new Gtk.Box({ orientation: Gtk.Orientation.HORIZONTAL, margin_top: 2 * MARGIN, margin_bottom: 2 * MARGIN, margin_start: 2 * MARGIN, margin_end: 2 * MARGIN, spacing: 5 });
+        let leftBox = new Gtk.Box({ orientation: Gtk.Orientation.VERTICAL, hexpand: true });
+        let rightBox = new Gtk.Box({ orientation: Gtk.Orientation.VERTICAL, hexpand: true });
+        leftBox.append(new Gtk.Label({ wrap: true, valign: Gtk.Align.START, halign: Gtk.Align.END, justify: Gtk.Justification.RIGHT,
+                                       use_markup: true, label: "<small>" + _GTK("Created by") + "</small>" }));
+        rightBox.append(new Gtk.Label({ wrap: true, valign: Gtk.Align.START, halign: Gtk.Align.START, justify: Gtk.Justification.LEFT,
+                                        use_markup: true, label: "<small><a href=\"https://codeber.org/abak\">Abakkk</a></small>" }));
+        creditBox.append(leftBox);
+        creditBox.append(rightBox);
+        vbox.append(creditBox);
        
        // Translators: add your name here or keep it empty, it will be displayed in about page, e.g.
        // msgstr ""
@ -124,12 +155,10 @@ const AboutPage = new GObject.Class({
        // "<a href=\"mailto:translator2@mail.org\">translator2</a>\n"
        // "<a href=\"https://...\">translator3</a>"
        if (_("translator-credits") != "translator-credits" && _("translator-credits") != "") {
-            leftBox.pack_start(new Gtk.Label(), false, false, 0);
-            rightBox.pack_start(new Gtk.Label(), false, false, 0);
-            leftLabel = new Gtk.Label({ wrap: true, valign: 1, halign: 2, justify: 1, use_markup: true, label: "<small>" + _GTK("Translated by") + "</small>" });
-            rightLabel = new Gtk.Label({ wrap: true, valign: 1, halign: 1, justify: 0, use_markup: true, label: "<small>" + _("translator-credits") + "</small>" });
-            leftBox.pack_start(leftLabel, false, false, 0);
-            rightBox.pack_start(rightLabel, false, false, 0);
+            leftBox.append(new Gtk.Label());
+            rightBox.append(new Gtk.Label());
+            leftBox.append(new Gtk.Label({ wrap: true, valign: Gtk.Align.START, halign: Gtk.Align.END, justify: 1, use_markup: true, label: "<small>" + _GTK("Translated by") + "</small>" }));
+            rightBox.append(new Gtk.Label({ wrap: true, valign: Gtk.Align.START, halign: Gtk.Align.START, justify: 0, use_markup: true, label: "<small>" + _("translator-credits") + "</small>" }));
        }
    }
 });
@ -144,44 +173,46 @@ const DrawingPage = new GObject.Class({
        this.settings = Convenience.getSettings(Me.metadata['settings-schema'] + '.drawing');
        this.schema = this.settings.settings_schema;
        
-        let box = new Gtk.Box({ orientation: Gtk.Orientation.VERTICAL, margin: 3 * MARGIN, spacing: 3 * MARGIN });
-        this.add(box);
+        let box = new Gtk.Box({ orientation: Gtk.Orientation.VERTICAL, margin_top: 3 * MARGIN, margin_bottom: 3 * MARGIN, margin_start: 3 * MARGIN, margin_end: 3 * MARGIN, spacing: 3 * MARGIN });
+        this.set_child(box);
        
        let palettesFrame = new Frame({ label: _("Palettes") });
-        box.add(palettesFrame);
+        box.append(palettesFrame);
        let palettesFrameBox = new Gtk.Box({ orientation: Gtk.Orientation.VERTICAL });
-        palettesFrame.add(palettesFrameBox);
+        palettesFrame.set_child(palettesFrameBox);
        
        let palettesScrolledWindow = new Gtk.ScrolledWindow({ vscrollbar_policy: Gtk.PolicyType.NEVER });
-        palettesFrameBox.add(palettesScrolledWindow);
-        let palettesViewport = new Gtk.Viewport({ margin_top: MARGIN / 2, margin_bottom: MARGIN / 2 });
-        palettesScrolledWindow.add(palettesViewport);
+        palettesFrameBox.append(palettesScrolledWindow);
        this.palettesListBox = new Gtk.ListBox({ selection_mode: 0, hexpand: true });
        this.palettesListBox.get_style_context().add_class('background');
-        this.palettesListBox.get_accessible().set_name(this.schema.get_key('palettes').get_summary());
-        this.palettesListBox.get_accessible().set_description(this.schema.get_key('palettes').get_description());
-        palettesViewport.add(this.palettesListBox);
+        setAccessibleLabel(this.palettesListBox, this.schema.get_key('palettes').get_summary());
+        setAccessibleDescription(this.palettesListBox, this.schema.get_key('palettes').get_description());
+        palettesScrolledWindow.set_child(this.palettesListBox);
+        palettesScrolledWindow.get_child().set_margin_top(MARGIN / 2);
+        palettesScrolledWindow.get_child().set_margin_bottom(MARGIN / 2);
        
        this.settings.connect('changed::palettes', this._updatePalettes.bind(this));
        this._updatePalettes();
        
        let addBox = new Gtk.Box(ROWBOX_MARGIN_PARAMS);
-        let addButton = Gtk.Button.new_from_icon_name('list-add-symbolic', Gtk.IconSize.BUTTON);
+        let addButton = IS_GTK3 ? Gtk.Button.new_from_icon_name('list-add-symbolic', Gtk.IconSize.BUTTON) : Gtk.Button.new_from_icon_name('list-add-symbolic');
        addButton.set_tooltip_text(_("Add a new palette"));
-        addBox.pack_start(addButton, true, true, 4);
+        addButton.set_hexpand(true);
+        addBox.append(addButton);
        addButton.connect('clicked', this._addNewPalette.bind(this));
-        let importButton = Gtk.Button.new_from_icon_name('document-open-symbolic', Gtk.IconSize.BUTTON);
+        let importButton = IS_GTK3 ?  Gtk.Button.new_from_icon_name('document-open-symbolic', Gtk.IconSize.BUTTON) : Gtk.Button.new_from_icon_name('document-open-symbolic');
        importButton.set_tooltip_text(_GTK("Select a File"));
-        addBox.pack_start(importButton, true, true, 4);
+        importButton.set_hexpand(true);
+        addBox.append(importButton);
        importButton.connect('clicked', this._importPalette.bind(this));
-        palettesFrameBox.add(addBox);
+        palettesFrameBox.append(addBox);
        
        let areaFrame = new Frame({ label: _("Area") });
-        box.add(areaFrame);
+        box.append(areaFrame);
        
        let areaListBox = new Gtk.ListBox({ selection_mode: 0, hexpand: true, margin_top: MARGIN / 2, margin_bottom: MARGIN / 2 });
        areaListBox.get_style_context().add_class('background');
-        areaFrame.add(areaListBox);
+        areaFrame.set_child(areaListBox);
        
        let squareAreaRow = new PrefRow({ label: this.schema.get_key('square-area-size').get_summary() });
        let squareAreaAutoButton = new Gtk.CheckButton({ label: _("Auto"),
@ -196,7 +227,7 @@ const DrawingPage = new GObject.Class({
        squareAreaAutoButton.bind_property('active', squareAreaSizeButton, 'sensitive', GObject.BindingFlags.SYNC_CREATE | GObject.BindingFlags.INVERT_BOOLEAN);
        squareAreaRow.addWidget(squareAreaAutoButton);
        squareAreaRow.addWidget(squareAreaSizeButton);
-        areaListBox.add(squareAreaRow);
+        areaListBox.insert(squareAreaRow, -1);
        
        let backgroundColorRow = new PrefRow({ label: this.schema.get_key('background-color').get_summary() });
        let backgroundColorButton = new ColorStringButton({ use_alpha: true, show_editor: true,
@ -204,7 +235,7 @@ const DrawingPage = new GObject.Class({
                                                            tooltip_text: this.schema.get_key('background-color').get_description() });
        this.settings.bind('background-color', backgroundColorButton, 'color-string', 0);
        backgroundColorRow.addWidget(backgroundColorButton);
-        areaListBox.add(backgroundColorRow);
+        areaListBox.insert(backgroundColorRow, -1);
        
        let gridLineRow = new PrefRow({ label: _("Grid overlay line") });
        let gridLineAutoButton = new Gtk.CheckButton({ label: _("Auto"),
@ -226,7 +257,7 @@ const DrawingPage = new GObject.Class({
        gridLineRow.addWidget(gridLineAutoButton);
        gridLineRow.addWidget(gridLineWidthButton);
        gridLineRow.addWidget(gridLineSpacingButton);
-        areaListBox.add(gridLineRow);
+        areaListBox.insert(gridLineRow, -1);
        
        let gridColorRow = new PrefRow({ label: this.schema.get_key('grid-color').get_summary() });
        let gridColorButton = new ColorStringButton({ use_alpha: true, show_editor: true,
@ -234,14 +265,14 @@ const DrawingPage = new GObject.Class({
                                                      tooltip_text: this.schema.get_key('grid-color').get_description() });
        this.settings.bind('grid-color', gridColorButton, 'color-string', 0);
        gridColorRow.addWidget(gridColorButton);
-        areaListBox.add(gridColorRow);
+        areaListBox.insert(gridColorRow, -1);
        
        let toolsFrame = new Frame({ label: _("Tools") });
-        box.add(toolsFrame);
+        box.append(toolsFrame);
        
        let toolsListBox = new Gtk.ListBox({ selection_mode: 0, hexpand: true, margin_top: MARGIN / 2, margin_bottom: MARGIN / 2 });
        toolsListBox.get_style_context().add_class('background');
-        toolsFrame.add(toolsListBox);
+        toolsFrame.set_child(toolsListBox);
        
        let dashArrayRow = new PrefRow({ label: _("Dash array") });
        let dashArrayAutoButton = new Gtk.CheckButton({ label: _("Auto"),
@ -263,7 +294,7 @@ const DrawingPage = new GObject.Class({
        dashArrayRow.addWidget(dashArrayAutoButton);
        dashArrayRow.addWidget(dashArrayOnButton);
        dashArrayRow.addWidget(dashArrayOffButton);
-        toolsListBox.add(dashArrayRow);
+        toolsListBox.insert(dashArrayRow, -1);
        
        let dashOffsetRow = new PrefRow({ label: this.schema.get_key('dash-offset').get_summary() });
        let dashOffsetButton = new PixelSpinButton({ width_chars: 5, digits: 1, step: 0.1,
@ -272,7 +303,7 @@ const DrawingPage = new GObject.Class({
                                                     tooltip_text: this.schema.get_key('dash-offset').get_description() });
        this.settings.bind('dash-offset', dashOffsetButton, 'value', 0);
        dashOffsetRow.addWidget(dashOffsetButton);
-        toolsListBox.add(dashOffsetRow);
+        toolsListBox.insert(dashOffsetRow, -1);
        
        let imageLocationRow = new PrefRow({ label: this.schema.get_key('image-location').get_summary() });
        let imageLocationButton = new FileChooserButton({ action: Gtk.FileChooserAction.SELECT_FOLDER,
@ -280,19 +311,19 @@ const DrawingPage = new GObject.Class({
                                                          tooltip_text: this.schema.get_key('image-location').get_description() });
        this.settings.bind('image-location', imageLocationButton, 'location', 0);
        imageLocationRow.addWidget(imageLocationButton);
-        toolsListBox.add(imageLocationRow);
+        toolsListBox.insert(imageLocationRow, -1);
        
        let resetButton = new Gtk.Button({ label: _("Reset settings"), halign: Gtk.Align.CENTER });
        resetButton.get_style_context().add_class('destructive-action');
        resetButton.connect('clicked', () => this.schema.list_keys().forEach(key => this.settings.reset(key)));
-        box.add(resetButton);
+        box.append(resetButton);
    },
    
    _updatePalettes: function() {
        this.palettes = this.settings.get_value('palettes').deep_unpack();
-        this.palettesListBox.get_children().slice(this.palettes.length)
+        getChildrenOf(this.palettesListBox).slice(this.palettes.length)
                                           .forEach(row => this.palettesListBox.remove(row));
-        let paletteBoxes = this.palettesListBox.get_children().map(row => row.get_child());
+        let paletteBoxes = getChildrenOf(this.palettesListBox).map(row => row.get_child());
        
        this.palettes.forEach((palette, paletteIndex) => {
            let [name, colors] = palette;
@ -300,22 +331,24 @@ const DrawingPage = new GObject.Class({
            
            if (paletteBoxes[paletteIndex]) {
                paletteBox = paletteBoxes[paletteIndex];
-                let nameEntry = paletteBox.get_children()[0];
+                let nameEntry = getChildrenOf(paletteBox)[0];
                if (nameEntry.get_text() !== _(name)) {
                    GObject.signal_handler_block(nameEntry, nameEntry.paletteNameChangedHandler);
                    nameEntry.set_text(_(name));
                    GObject.signal_handler_unblock(nameEntry, nameEntry.paletteNameChangedHandler);
                }
            } else {
-                let nameEntry = new Gtk.Entry({ text: name, halign: Gtk.Align.START, tooltip_text: _("Rename the palette") });
+                let nameEntry = new Gtk.Entry({ text: name, halign: Gtk.Align.START, tooltip_text: _("Rename the palette"), hexpand: true });
                nameEntry.paletteNameChangedHandler = nameEntry.connect('changed', this._onPaletteNameChanged.bind(this, paletteIndex));
-                let removeButton = Gtk.Button.new_from_icon_name('list-remove-symbolic', Gtk.IconSize.BUTTON);
+                // Minimum size, for Gtk4
+                nameEntry.set_size_request(nameEntry.get_preferred_size()[1].width, -1);
+                let removeButton = IS_GTK3 ? Gtk.Button.new_from_icon_name('list-remove-symbolic', Gtk.IconSize.BUTTON) : Gtk.Button.new_from_icon_name('list-remove-symbolic');
                removeButton.set_tooltip_text(_("Remove the palette")); 
                removeButton.connect('clicked', this._removePalette.bind(this, paletteIndex));
                paletteBox = new Gtk.Box(ROWBOX_MARGIN_PARAMS);
-                paletteBox.pack_start(nameEntry, true, true, 4);
-                paletteBox.pack_start(new Gtk.Box({ spacing: 4 }), false, false, 4);
-                paletteBox.pack_start(removeButton, false, false, 4);
+                paletteBox.append(nameEntry);
+                paletteBox.append(new Gtk.Box({ spacing: 4 }));
+                paletteBox.append(removeButton);
                this.palettesListBox.insert(paletteBox, paletteIndex);
                paletteBox.get_parent().set_activatable(false);
            }
@ -323,8 +356,8 @@ const DrawingPage = new GObject.Class({
            while (colors.length < 9)
                colors.push('transparent');
            
-            let colorsBox = paletteBox.get_children()[1];
-            let colorButtons = colorsBox.get_children();
+            let colorsBox = getChildrenOf(paletteBox)[1];
+            let colorButtons = getChildrenOf(colorsBox);
            colors.forEach((color, colorIndex) => {
                let [colorString, displayName] = color.split(':');
                if (colorButtons[colorIndex]) {
@ -335,11 +368,12 @@ const DrawingPage = new GObject.Class({
                                                              use_alpha: true, show_editor: true,
                                                              halign: Gtk.Align.START, hexpand: false });
                    colorButton.connect('notify::color-string', this._onPaletteColorChanged.bind(this, paletteIndex, colorIndex));
-                    colorsBox.add(colorButton);
+                    colorsBox.append(colorButton);
                }
            });
            
-            paletteBox.show_all();
+            if (IS_GTK3)
+                paletteBox.show_all();
        });
    },
    
@ -367,17 +401,31 @@ const DrawingPage = new GObject.Class({
    },
    
    _importPalette: function() {
-        let dialog = new Gtk.FileChooserNative({ action: Gtk.FileChooserAction.OPEN, title: _GTK("Select a File") });
+        let dialog = new Gtk.FileChooserDialog({
+            title: _GTK("Select a File"),
+            action: Gtk.FileChooserAction.OPEN,
+            modal: true,
+            transient_for: IS_GTK3 ? this.get_toplevel() : this.get_root(),
+        });
+        dialog.add_button(_GTK("_Cancel"), Gtk.ResponseType.CANCEL);
+        dialog.add_button(_GTK("_Open"), Gtk.ResponseType.ACCEPT);
+        
        let filter = new Gtk.FileFilter();
        filter.set_name("GIMP Palette (*.gpl)");
        filter.add_pattern('*.gpl');
        dialog.add_filter(filter);
-        if (dialog.run() == Gtk.ResponseType.ACCEPT) {
-            let file = dialog.get_file();
-            let palettes = GimpPaletteParser.parseFile(file);
-            palettes.forEach(palette => this.palettes.push(palette));
-            this._savePalettes();
-        }
+        
+        dialog.connect('response', (dialog, response) => {
+            if (response == Gtk.ResponseType.ACCEPT) {
+                let file = dialog.get_file();
+                let palettes = GimpPaletteParser.parseFile(file);
+                palettes.forEach(palette => this.palettes.push(palette));
+                this._savePalettes();
+            }
+            dialog.destroy();
+        });
+        
+        dialog.show();
    },
    
    _removePalette: function(paletteIndex) {
@ -397,24 +445,24 @@ const PrefsPage = new GObject.Class({
        let schema = settings.settings_schema;
        let internalShortcutSettings = Convenience.getSettings(Me.metadata['settings-schema'] + '.internal-shortcuts');
        
-        let box = new Gtk.Box({ orientation: Gtk.Orientation.VERTICAL, margin: MARGIN * 3, spacing: 3 * MARGIN });
-        this.add(box);
+        let box = new Gtk.Box({ orientation: Gtk.Orientation.VERTICAL, margin_top: 3 * MARGIN, margin_bottom: 3 * MARGIN, margin_start: 3 * MARGIN, margin_end: 3 * MARGIN, spacing: 3 * MARGIN });
+        this.set_child(box);
        
        let globalFrame = new Frame({ label: _("Global") });
-        box.add(globalFrame);
+        box.append(globalFrame);
        
        let listBox = new Gtk.ListBox({ selection_mode: 0, hexpand: true, margin_top: MARGIN, margin_bottom: MARGIN / 2 });
        listBox.get_style_context().add_class('background');
-        globalFrame.add(listBox);
+        globalFrame.set_child(listBox);
        
        Shortcuts.GLOBAL_KEYBINDINGS.forEach((settingKeys, index) => {
            if (index)
-                listBox.add(new Gtk.Box(ROWBOX_MARGIN_PARAMS));
+                listBox.insert(new Gtk.Box(ROWBOX_MARGIN_PARAMS), -1);
            
            let globalKeybindingsRow = new Gtk.ListBoxRow({ activatable: false });
            let globalKeybindingsWidget = new KeybindingsWidget(settingKeys, settings);
-            globalKeybindingsRow.add(globalKeybindingsWidget);
-            listBox.add(globalKeybindingsRow);
+            globalKeybindingsRow.set_child(globalKeybindingsWidget);
+            listBox.insert(globalKeybindingsRow, -1);
        });
        
        let persistentOverTogglesKey = schema.get_key('persistent-over-toggles');
@ -422,7 +470,7 @@ const PrefsPage = new GObject.Class({
        let persistentOverTogglesSwitch = new Gtk.Switch();
        settings.bind('persistent-over-toggles', persistentOverTogglesSwitch, 'active', 0);
        persistentOverTogglesRow.addWidget(persistentOverTogglesSwitch, true);
-        listBox.add(persistentOverTogglesRow);
+        listBox.insert(persistentOverTogglesRow, -1);
        
        let persistentOverRestartsKey = schema.get_key('persistent-over-restarts');
        let persistentOverRestartsRow = new PrefRow({ label: persistentOverRestartsKey.get_summary(), desc: persistentOverRestartsKey.get_description() });
@ -430,7 +478,7 @@ const PrefsPage = new GObject.Class({
        settings.bind('persistent-over-restarts', persistentOverRestartsSwitch, 'active', 0);
        persistentOverRestartsRow.addWidget(persistentOverRestartsSwitch, true);
        persistentOverTogglesSwitch.bind_property('active', persistentOverRestartsSwitch, 'sensitive', GObject.BindingFlags.SYNC_CREATE);
-        listBox.add(persistentOverRestartsRow);
+        listBox.insert(persistentOverRestartsRow, -1);
        
        let desktopKey = schema.get_key('drawing-on-desktop');
        let desktopRow = new PrefRow({ label: desktopKey.get_summary(), desc: desktopKey.get_description() });
@ -438,56 +486,53 @@ const PrefsPage = new GObject.Class({
        settings.bind('drawing-on-desktop', desktopSwitch, 'active', 0);
        desktopRow.addWidget(desktopSwitch, true);
        persistentOverTogglesSwitch.bind_property('active', desktopSwitch, 'sensitive', GObject.BindingFlags.SYNC_CREATE);
-        listBox.add(desktopRow);
+        listBox.insert(desktopRow, -1);
        
        let osdKey = schema.get_key('osd-disabled');
        let osdRow = new PrefRow({ label: osdKey.get_summary(), desc: osdKey.get_description() });
        let osdSwitch = new Gtk.Switch();
        settings.bind('osd-disabled', osdSwitch, 'active', 0);
        osdRow.addWidget(osdSwitch, true);
-        listBox.add(osdRow);
+        listBox.insert(osdRow, -1);
        
        let indicatorKey = schema.get_key('indicator-disabled');
        let indicatorRow = new PrefRow({ label: indicatorKey.get_summary(), desc: indicatorKey.get_description() });
        let indicatorSwitch = new Gtk.Switch();
        settings.bind('indicator-disabled', indicatorSwitch, 'active', 0);
        indicatorRow.addWidget(indicatorSwitch, true);
-        listBox.add(indicatorRow);
+        listBox.insert(indicatorRow, -1);
        
        let internalFrame = new Frame({ label: _("Internal"), desc: _("In drawing mode") });
-        box.add(internalFrame);
+        box.append(internalFrame);
        
        listBox = new Gtk.ListBox({ selection_mode: 0, hexpand: true, margin_top: MARGIN, margin_bottom: MARGIN });
        listBox.get_style_context().add_class('background');
-        internalFrame.add(listBox);
+        internalFrame.set_child(listBox);
        
        Shortcuts.OTHERS.forEach((pairs, index) => {
            if (index)
-                listBox.add(new Gtk.Box(ROWBOX_MARGIN_PARAMS));
+                listBox.insert(new Gtk.Box(ROWBOX_MARGIN_PARAMS), -1);
            
            pairs.forEach(pair => {
                let [action, shortcut] = pair;
-                let otherBox = new Gtk.Box({ margin_left: MARGIN, margin_right: MARGIN });
-                let otherLabel = new Gtk.Label({ label: action, use_markup: true });
-                otherLabel.set_halign(1);
-                let otherLabel2 = new Gtk.Label({ label: shortcut });
-                otherBox.pack_start(otherLabel, true, true, 4);
-                otherBox.pack_start(otherLabel2, false, false, 4);
-                listBox.add(otherBox);
+                let otherBox = new Gtk.Box({ margin_start: MARGIN, margin_end: MARGIN, spacing: 4 });
+                otherBox.append(new Gtk.Label({ label: action, use_markup: true, halign: Gtk.Align.START, hexpand: true }));
+                otherBox.append(new Gtk.Label({ label: shortcut }));
+                listBox.insert(otherBox, -1);
            });
        });
        
-        listBox.add(new Gtk.Box(ROWBOX_MARGIN_PARAMS));
+        listBox.insert(new Gtk.Box(ROWBOX_MARGIN_PARAMS), -1);
        
        Shortcuts.INTERNAL_KEYBINDINGS.forEach((settingKeys, index) => {
            if (index)
-                listBox.add(new Gtk.Box(ROWBOX_MARGIN_PARAMS));
+                listBox.insert(new Gtk.Box(ROWBOX_MARGIN_PARAMS), -1);
            
            let internalKeybindingsWidget = new KeybindingsWidget(settingKeys, internalShortcutSettings);
-            listBox.add(internalKeybindingsWidget);
+            listBox.insert(internalKeybindingsWidget, -1);
        });
        
-        listBox.get_children().forEach(row => row.set_activatable(false));
+        getChildrenOf(listBox).forEach(row => row.set_activatable(false));
        
        let resetButton = new Gtk.Button({ label: _("Reset settings"), halign: Gtk.Align.CENTER });
        resetButton.get_style_context().add_class('destructive-action');
@ -495,7 +540,7 @@ const PrefsPage = new GObject.Class({
            internalShortcutSettings.settings_schema.list_keys().forEach(key => internalShortcutSettings.reset(key));
            settings.settings_schema.list_keys().forEach(key => settings.reset(key));
        });
-        box.add(resetButton);
+        box.append(resetButton);
    }
 });

@ -504,12 +549,12 @@ const Frame = new GObject.Class({
    Extends: Gtk.Frame,

    _init: function(params) {
-        let labelWidget = new Gtk.Label({ margin_bottom: MARGIN / 2, use_markup: true, label: `<b><big>${params.label}</big></b>` });
-        this.parent({ label_yalign: 1.0, label_widget: labelWidget });
+        let labelWidget = new Gtk.Label({ use_markup: true, label: `<b><big>${params.label}</big></b>` });
+        this.parent({ label_widget: labelWidget });
        
        if (params.desc) {
            labelWidget.set_tooltip_text(params.desc);
-            this.get_accessible().set_description(params.desc);
+            setAccessibleDescription(this, params.desc);
        }
    }
 });
@ -522,37 +567,37 @@ const PrefRow = new GObject.Class({
        this.parent({ activatable: false });
        
        let hbox = new Gtk.Box(ROWBOX_MARGIN_PARAMS);
-        this.add(hbox);
+        this.set_child(hbox);
        
-        let labelBox = new Gtk.Box({ orientation: Gtk.Orientation.VERTICAL });
-        hbox.pack_start(labelBox, true, true, 4);
+        let labelBox = new Gtk.Box({ orientation: Gtk.Orientation.VERTICAL, hexpand: true });
+        hbox.append(labelBox);
        
        this.widgetBox = new Gtk.Box({ spacing: 4 });
-        hbox.pack_start(this.widgetBox, false, false, 4);
+        hbox.append(this.widgetBox);
        
-        this.label = new Gtk.Label({ use_markup: true, label: params.label, halign: Gtk.Align.START });
-        labelBox.pack_start(this.label, true, true, 0);
+        this.label = new Gtk.Label({ use_markup: true, label: params.label, halign: Gtk.Align.START, vexpand: true });
+        labelBox.append(this.label);
        if (params.desc) {
-            this.desc = new Gtk.Label({ use_markup: true, label: `<small>${params.desc}</small>`, halign: Gtk.Align.START, wrap: true, xalign: 0 });
+            this.desc = new Gtk.Label({ use_markup: true, label: `<small>${params.desc}</small>`, halign: Gtk.Align.START, wrap: true, xalign: 0, vexpand: true });
            this.desc.get_style_context().add_class('dim-label');
-            labelBox.pack_start(this.desc, true, true, 0);
+            labelBox.append(this.desc);
            this.widgetBox.set_valign(Gtk.Align.START);
        }
    },
    
    addWidget: function(widget, setRelationship) {
-        this.widgetBox.add(widget);
+        this.widgetBox.append(widget);
        
        if (widget.name)
-            widget.get_accessible().set_name(widget.name);
+            setAccessibleLabel(widget, widget.name);
        
-        if (setRelationship) {
-            this.label.get_accessible().add_relationship(Atk.RelationType.LABEL_FOR, widget.get_accessible());
-            widget.get_accessible().add_relationship(Atk.RelationType.LABELLED_BY, this.label.get_accessible());
+        if (setRelationship && IS_GTK3) {
+            this.label.get_accessible().add_relationship(imports.gi.Atk.RelationType.LABEL_FOR, widget.get_accessible());
+            widget.get_accessible().add_relationship(imports.gi.Atk.RelationType.LABELLED_BY, this.label.get_accessible());
            
            if (this.desc) {
-                this.desc.get_accessible().add_relationship(Atk.RelationType.DESCRIPTION_FOR, widget.get_accessible());
-                widget.get_accessible().add_relationship(Atk.RelationType.DESCRIBED_BY, this.desc.get_accessible());
+                this.desc.get_accessible().add_relationship(imports.gi.Atk.RelationType.DESCRIPTION_FOR, widget.get_accessible());
+                widget.get_accessible().add_relationship(imports.gi.Atk.RelationType.DESCRIBED_BY, this.desc.get_accessible());
            }
        }
    }
@ -584,15 +629,22 @@ const PixelSpinButton = new GObject.Class({
        this.adjustment.set_page_increment(step * 10);
    },
    
-    // Add 'px' unit.
-    vfunc_output: function() {
+    on_output: function() {
        this.text = _("%f px").format(Number(this.value).toFixed(2));
        return true;
    },
    
-    // Prevent accidental scrolling.
-    vfunc_scroll_event: function(event) {
-        return this.has_focus ? this.parent(event) : Gdk.EVENT_PROPAGATE;
+    // Prevent accidental scrolling (GTK 3).
+    on_scroll_event: function(event) {
+        if (this.has_focus) {
+            try {
+                GObject.signal_chain_from_overridden([this, event], false);
+            } catch(e) { }
+            
+            return Gdk.EVENT_STOP;
+        }
+        
+        return Gdk.EVENT_PROPAGATE;
    }
 });

@ -617,49 +669,70 @@ const ColorStringButton = new GObject.Class({
        this.set_rgba(newRgba);
    },
    
-    // Do nothing if the new color is equivalent to the old color (e.g. "black" and "rgb(0,0,0)").
-    vfunc_color_set(args) {
+    on_color_set: function() {
        let oldRgba = new Gdk.RGBA();
        oldRgba.parse(this.color_string);
        
+        // Do nothing if the new color is equivalent to the old color (e.g. "black" and "rgb(0,0,0)").
        if (!this.rgba.equal(oldRgba)) {
            this._color_string = this.rgba.to_string();
            this.notify('color-string');
-        }            
+        }
    }
 });

 const FileChooserButton = new GObject.Class({
    Name: `${UUID}-FileChooserButton`,
-    Extends: Gtk.FileChooserButton,
+    Extends: Gtk.Button,
    Properties: {
+        'action': GObject.ParamSpec.enum('action', 'action', 'action',
+                                         GObject.ParamFlags.READWRITE,
+                                         Gtk.FileChooserAction.$gtype,
+                                         Gtk.FileChooserAction.SELECT_FOLDER),
+        
        'location': GObject.ParamSpec.string('location', 'location', 'location',
                                             GObject.ParamFlags.READWRITE, '')
    },
    
    get location() {
-        return this.get_file().get_path();
+        return this._location || "";
    },
    
    set location(location) {
-        if (!location) {
-            this.unselect_all();
-            if (this.get_file())
-                this.set_file(Gio.File.new_for_path('aFileThatDoesNotExist'));
-            return;
+        if (!this._location || this._location != location) {
+            this._location = location;
+            this.label = location ?
+                         Gio.File.new_for_commandline_arg(location).query_info('standard::display-name', Gio.FileQueryInfoFlags.NONE, null).get_display_name() :
+                         _GTK("(None)");
+            
+            this.notify('location');
        }
-        
-        let file = Gio.File.new_for_commandline_arg(location);
-        if (file.query_exists(null))
-            this.set_file(file);
    },
    
-    vfunc_file_set: function(args) {
-        this.notify('location');
+    vfunc_clicked: function() {
+        let dialog = new Gtk.FileChooserDialog({
+            title: _(this.name),
+            action: this.action,
+            modal: true,
+            transient_for: IS_GTK3 ? this.get_toplevel() : this.get_root(),
+        });
+        dialog.add_button(_GTK("_Cancel"), Gtk.ResponseType.CANCEL);
+        dialog.add_button(_GTK("_Select"), Gtk.ResponseType.ACCEPT);
+        
+        if (this.location)
+            dialog.set_file(Gio.File.new_for_commandline_arg(this.location));
+        
+        dialog.connect('response', (dialog, response) => {
+            if (response == Gtk.ResponseType.ACCEPT)
+                    this.location = dialog.get_file().get_path();
+            dialog.destroy();
+        });
+        
+        dialog.show();
    }
 });

-// this code comes from Sticky Notes View by Sam Bull, https://extensions.gnome.org/extension/568/notes/
+// From Sticky Notes View by Sam Bull, https://extensions.gnome.org/extension/568/notes/
 const KeybindingsWidget = new GObject.Class({
    Name: `${UUID}-KeybindingsWidget`,
    Extends: Gtk.Box,
@ -713,7 +786,7 @@ const KeybindingsWidget = new GObject.Class({
            let [success, iterator ] =
                this._store.get_iter_from_string(iter);

-            if(!success) {
+            if (!success) {
                printerr("Can't change keybinding");
            }

@ -745,7 +818,7 @@ const KeybindingsWidget = new GObject.Class({
        this._tree_view.columns_autosize();
        this._tree_view.set_headers_visible(false);

-        this.add(this._tree_view);
+        this.append(this._tree_view);
        this.keybinding_column = keybinding_column;
        this.action_column = action_column;

@ -768,9 +841,11 @@ const KeybindingsWidget = new GObject.Class({
        this._store.clear();

        this._settingKeys.forEach(settingKey => {
-            let [key, mods] = Gtk.accelerator_parse(
-                this._settings.get_strv(settingKey)[0] || ''
-            );
+            let success_, key, mods;
+            if (IS_GTK3)
+                [key, mods] = Gtk.accelerator_parse(this._settings.get_strv(settingKey)[0] || '');
+            else
+                [success_, key, mods] = Gtk.accelerator_parse(this._settings.get_strv(settingKey)[0] || '');

            let iter = this._store.append();
            this._store.set(iter,
--- a/schemas/org.gnome.shell.extensions.draw-on-your-screen.gschema.xml
+++ b/schemas/org.gnome.shell.extensions.draw-on-your-screen.gschema.xml
@ -315,7 +315,7 @@
    </key>
    <key type="as" name="switch-text-alignment">
      <default>["&lt;Primary&gt;&lt;Alt&gt;a"]</default>
-      <summary>Toggle text alignment</summary>
+      <summary>Change text alignment</summary>
    </key>
    <key type="as" name="toggle-background">
      <default>["&lt;Primary&gt;b"]</default>
--- a/shortcuts.js
+++ b/shortcuts.js
@ -1,15 +1,9 @@
-/* jslint esversion: 6 */
-/* exported GLOBAL_KEYBINDINGS, INTERNAL_KEYBINDINGS, OTHERS */
-
 /*
 * Copyright 2019 Abakkk
 *
- * This file is part of DrawOnYourScreen, a drawing extension for GNOME Shell.
- * https://framagit.org/abakkk/DrawOnYourScreen
- *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
+ * 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,
@ -19,9 +13,16 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * SPDX-FileCopyrightText: 2019 Abakkk
+ * SPDX-License-Identifier: GPL-3.0-or-later
 */

+/* jslint esversion: 6 */
+/* exported GLOBAL_KEYBINDINGS, INTERNAL_KEYBINDINGS, OTHERS */
+
 const Gtk = imports.gi.Gtk;
+const IS_GTK3 = Gtk.get_major_version() == 3;

 const GS_VERSION = imports.misc.config.PACKAGE_VERSION;
 const ExtensionUtils = imports.misc.extensionUtils;
@ -32,7 +33,11 @@ const _ = imports.gettext.domain(Me.metadata['gettext-domain']).gettext;
 const internalShortcutsSchema = Convenience.getSettings(Me.metadata['settings-schema'] + '.internal-shortcuts').settings_schema;

 const getKeyLabel = function(accel) {
-    let [keyval, mods] = Gtk.accelerator_parse(accel);
+    let success_, keyval, mods;
+    if (IS_GTK3)
+        [keyval, mods] = Gtk.accelerator_parse(accel);
+    else
+        [success_, keyval, mods] = Gtk.accelerator_parse(accel);
    return Gtk.accelerator_get_label(keyval, mods);
 };
Author	SHA1	Message	Date
abakkk	ccfbfb4af8	update README	2021-06-19 13:32:55 +02:00
abakkk	463c1a4c5a	update to Codeberg	2021-05-28 18:09:02 +02:00
abakkk	40f4f0b946	change license	2021-05-27 18:54:08 +02:00
abakkk	5df2f8b992	Merge branch 'pile' into 'face' v11.1	2021-04-26 15:00:37 +02:00
abakkk	d716a398dc	version -> 11.1	2021-04-26 14:31:16 +02:00
abakkk	996a035017	update "How to draw an arrow" media in README	2021-04-26 14:30:36 +02:00
abakkk	92b8bddb6b	simplify prefs getChildrenOf GTK4 widgets are iterable.	2021-04-26 12:00:16 +02:00
abakkk	25e1f27ac9	make helper not blocking	2021-04-04 12:09:33 +02:00
abakkk	5ad5dfffd1	not to erase the text on Escape key pressed Related to #60.	2021-03-11 09:37:17 +01:00
abakkk	cb40739af7	override default handlers in prefs Use GJS GObject overrides. Not to matter whether the signal exists.	2021-03-11 09:20:39 +01:00
O. Giesmann	c87003101c	Update draw-on-your-screen.po	2021-03-10 09:50:35 +01:00
abakkk	e9abbbb1c4	Merge branch 'pile' into 'face' v11 See merge request abakkk/DrawOnYourScreen!22	2021-02-20 00:26:42 +00:00
abakkk	41e7a9d547	version -> 11	2021-02-20 01:14:22 +01:00
abakkk	1a993dca38	update french localization	2021-02-20 01:13:39 +01:00
abakkk	e470e2f40d	fixes for old GS versions	2021-02-20 00:56:21 +01:00
abakkk	137742d471	adapt to Clutter API changes device.get_coords() has been removed and seat.query_state() is unusable with null sequences.	2021-02-19 23:24:04 +01:00
abakkk	d125d77d01	Gtk4 port Tested with Gtk 4.1.0.	2021-02-19 23:23:58 +01:00
abakkk	f087570eb5	minor, param renaming "showTextRectangle" -> "showElementBounds" and "drawTextRectangle" -> "drawElementBounds".	2021-02-19 23:21:35 +01:00
abakkk	27a398d0e1	add convenient marks for rotation and stretch transformations	2021-02-19 23:21:04 +01:00
abakkk	ca6baf0dc8	minor, enumeration syntax	2021-02-19 23:20:57 +01:00
abakkk	cb49c83799	add centered text alignment	2021-02-19 23:20:29 +01:00
abakkk	3223a6fdca	return to start a new text line `Shift + Return` was not compatible with the ibusCandidatePopup. So the only way to "validate" a text element is to click outside the text area. Related to #56.	2021-02-19 23:19:58 +01:00
abakkk	5698f3f7cb	multi-line text elements * Can browse and break lines anywhere * Can past multi-line texts * Do not need lineIndex anymore and grouped lines are preserved permanently Related to #56	2021-02-19 23:19:50 +01:00
abakkk	f18e8e6ac0	add toggle animations * background * grid * square area	2021-02-19 23:19:41 +01:00