Merge lp:~nathive-dev/nathive/0.870_experimental into lp:nathive

[Marcos Diaz]

=== added file 'AUTHORS'
--- AUTHORS	1970-01-01 00:00:00 +0000
+++ AUTHORS	2009-12-12 11:55:22 +0000
@@ -0,0 +1,25 @@
+CODE:
+Marcos Díaz Mencía <[e-mail]>
+Christopher Grebs <[e-mail]>
+Sören Wegener <[e-mail]>
+
+TRANSLATIONS:
+Dariusz Jakoniuk <[e-mail]>
+Marco Neumann <[e-mail]>
+Zoltan Hoppar <[e-mail]>
+Xu Xiaodong <[e-mail]>
+Nafergo Nafergo <[e-mail]>
+David Sagnol <[e-mail]>
+Cristiano Vitorino <[e-mail]>
+Daniel Nylander <[e-mail]>
+Angelo Gemmi <[e-mail]>
+
+ART:
+Ana del Cerro <[e-mail]>
+
+THANKS TO:
+Free Software Foundation <http://www.fsf.org>
+GTK+ team <http://www.gtk.org>
+Python Software Foundation <http://www.python.org/>
+PyGTK team <http://www.pygtk.org>
+You, for being libre.

=== removed file 'COPYING'
--- COPYING	2008-11-26 01:33:49 +0000
+++ COPYING	1970-01-01 00:00:00 +0000
@@ -1,674 +0,0 @@
-                    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>.

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

=== added file 'LICENSE-BRIEF'
--- LICENSE-BRIEF	1970-01-01 00:00:00 +0000
+++ LICENSE-BRIEF	2009-12-12 11:55:22 +0000
@@ -0,0 +1,5 @@
+Nathive 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.
+
+Nathive 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 Nathive. If not, see <http://www.gnu.org/licenses/>.

=== removed file 'Makefile'
--- Makefile	2008-12-01 07:53:03 +0000
+++ Makefile	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-compile:
-	@(gcc nathive.c -o nathive `pkg-config --cflags --libs gtk+-2.0`)
-
-run:
-	@(gcc nathive.c -o nathive `pkg-config --cflags --libs gtk+-2.0`)
-	@(./nathive)
-
-debug:
-	@(gcc -g nathive.c -o nathive `pkg-config --cflags --libs gtk+-2.0`)
-	@(gdb nathive)

=== added file 'README'
--- README	1970-01-01 00:00:00 +0000
+++ README	2009-12-12 11:55:22 +0000
@@ -0,0 +1,80 @@
+
+Nathive README
+==============
+
+
+Attention
+---------
+
+This project is in alpha phase, so it is an incomplete work, unfit for the end
+user yet. You can submit bugs, ideas, or code through:
+<http://dev.nathive.org/>
+
+
+Install from source requires
+----------------------------
+
+- libgtk2.0-dev
+- python
+- python-dev
+- dpkg (for deb packaging)
+- rpmbuild (for rpm packaging)
+
+
+Install
+-------
+
+1) Open terminal in downloaded folder.
+2) Type "make" as user to compile the low-level libraries.
+3) Type "make deb" or "make rpm" as root to create a binary package.
+4) Double-click on the package to install into your distro.
+
+
+Other make options
+------------------
+
+Type "make install" as root to old-school install way, then the installation
+will not be registered in any database and you can not uninstall automatically
+or handle versions.
+
+Type "make unpyc" as user to delete unnecesary .pyc files. don't worry about,
+it's automatic when you perform an installation. (Tip: launch Python with -B
+option to avoid generating .pyc files when you are hacking)
+
+Type "make source" as user to delete unneeded files and clean code before commit
+in the version control system or redistribute as source.
+
+Type "make spaces" as user to reformat all .py files with spaced indentation.
+This also perform a trailing space/line remove.
+
+Type "make tabs" as user to reformat all .py files with tabbed indentation,
+useful if you think tab is explicit and space groups are implicit, and you like
+Python Zen over PEP08. This also perform a trailing space/line remove.
+
+Type "make pot" to create a Gettext language template.
+
+
+License
+-------
+
+Nathive 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.
+
+Nathive 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 Nathive.  If not, see <http://www.gnu.org/licenses/>.
+
+The supplied GNU GPL copy is the file called LICENSE.
+
+
+We are online!
+--------------
+
+Visit <http://www.nathive.org/> and get the latest source and info, also you
+can find many ways to contact Nathive people. See you!

=== added file 'TODO'
--- TODO	1970-01-01 00:00:00 +0000
+++ TODO	2009-12-12 11:55:22 +0000
@@ -0,0 +1,35 @@
+
+Nathive TODO
+============
+
+
+High priority
+-------------
+
+- Integrate open/about dialogs as plugins
+- Code the object/layer engine
+- Code the new file dialog
+
+
+Medium priority
+---------------
+
+- Code zoom
+- Code user action log (undo/redo)
+
+
+Low priority
+------------
+
+- Code mask
+- Code missed tools and filters
+- Code keyboard shorcuts
+- Define save format
+- Create a web repository that build packages automatically for various archs
+- Integrate some unittest suite
+
+
+Roadmap
+-------
+
+For more see <http://docs.nathive.org/Developer/Roadmap>

=== added file 'VERSION'
--- VERSION	1970-01-01 00:00:00 +0000
+++ VERSION	2009-12-12 11:55:22 +0000
@@ -0,0 +1,5 @@
+[meta]
+version = 0.870
+release = 1
+phase = experimental
+maintainer = Nathive Developers <[e-mail]>

=== added directory 'cfg'
=== removed directory 'cfg'
=== removed file 'cfg/cfg.xml'
--- cfg/cfg.xml	2008-11-26 01:33:49 +0000
+++ cfg/cfg.xml	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<cfg>
-	<misc>
-		<language>auto</language>
-		<folder-last>~/</folder-last>
-		<win-w>950</win-w>
-		<win-h>550</win-h>
-	</misc>
-	<color>
-		<r>87</r>
-		<g>171</g>
-		<b>255</b>
-	</color>	
-	<brush>
-		<size>30</size>
-		<mode>1</mode>
-		<soft>50</soft>
-		<opacity>25</opacity>
-		<space>0</space>
-	</brush>
-</cfg>

=== added file 'cfg/default.cfg'
--- cfg/default.cfg	1970-01-01 00:00:00 +0000
+++ cfg/default.cfg	2009-12-12 11:55:22 +0000
@@ -0,0 +1,23 @@
+[color]
+r = 87
+b = 255
+g = 171
+
+[misc]
+folder = ~
+height = 550
+language = auto
+maximize = 0
+sidebar = 1
+tabmaxlen = 24
+width = 950
+
+[brush]
+opacity = 100
+shape = 1
+spacing = 1
+soft = 100
+size = 30
+
+[toolbar]
+sort = select,picker,brush

=== removed directory 'gb'
=== removed file 'gb/brush.c'
--- gb/brush.c	2008-11-26 01:33:49 +0000
+++ gb/brush.c	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-/* 
- *  This file is part of Nathive.
- * 
- *  Nathive 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.
- * 
- *  Nathive 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 Nathive.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-
-uchar *brush_raw; 
-int brush_size = 30;
-int brush_size_max = 100;
-int brush_mode = 0;
-int brush_fade = 0;
-int brush_opacity = 100;
-int brush_space = 0;
-
-//gtk
-GtkWidget *adj_brush_mode[2];
-GtkObject *adj_brush_size;
-GtkObject *adj_brush_fade;
-GtkObject *adj_brush_opacity;
-GtkWidget *adj_brush_space;
-

=== removed file 'gb/dialog-new.c'
--- gb/dialog-new.c	2008-11-26 01:33:49 +0000
+++ gb/dialog-new.c	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-/* 
- *  This file is part of Nathive.
- * 
- *  Nathive 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.
- * 
- *  Nathive 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 Nathive.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-
-int dialog_new_template = 0;
-int dialog_new_unit = 0;
-int dialog_new_pxw = 400;
-int dialog_new_pxh = 300;
-int dialog_new_dpi = 150;
-double dialog_new_cmw = 0;
-double dialog_new_cmh = 0;
-double dialog_new_inw = 0;
-double dialog_new_inh = 0;
-int dialog_new_nobg = 0;
-int dialog_new_pxw_ops = -1;
-int dialog_new_pxh_ops = -1;
-int dialog_new_cmw_ops = -1;
-int dialog_new_cmh_ops = -1;
-int dialog_new_inw_ops = -1;
-int dialog_new_inh_ops = -1;
-int dialog_new_dpi_ops = -1;
-
-//gtk
-GtkWidget *dialog_new_template_combo;
-GtkWidget *dialog_new_unit_combo;
-GtkWidget *dialog_new_box_px;
-GtkWidget *dialog_new_box_re;
-GtkWidget *dialog_new_box_cm;
-GtkWidget *dialog_new_box_in;
-GtkObject *dialog_new_adj[7];
-GtkWidget *dialog_new_nobg_check;
-

=== removed file 'gb/global.c'
--- gb/global.c	2008-11-26 18:12:53 +0000
+++ gb/global.c	1970-01-01 00:00:00 +0000
@@ -1,64 +0,0 @@
-/* 
- *  This file is part of Nathive.
- * 
- *  Nathive 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.
- * 
- *  Nathive 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 Nathive.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-
-NTree *dom;
-int tool = 0;
-int win_w = 950;
-int win_h = 550;
-int fullscreen = 0;
-int main_load = 0;
-int feedback_lock = 0;
-
-char *language_ = "auto";
-char *language[100];
-char *folder_last = "/home";
-int unsaved_count = 1;
-
-uchar color1[3];
-int color1hsv[3];
-char *color1hex;
-void *toolbar_color1[4];
-
-int user_button = 0;
-int user_x = 0;
-int user_y = 0;
-int user_x_root = 0;
-int user_y_root = 0;
-int user_x_press = 0;
-int user_y_press = 0;
-
-int statusbar_w = 0;
-int statusbar_h = 0;
-int statusbar_x = 0;
-int statusbar_y = 0;
-int statusbar_z = 1;
-int statusbar_msg = 0;
-
-//gtk
-GtkWidget *win;
-GtkWidget *tabs;
-GtkWidget *sidebar;
-GtkWidget *sidebar_tool;
-GtkWidget *sidebar_tools[TOOLS];
-GtkWidget *statusbar;
-GtkWidget *object_tree_view;
-
-GtkObject *adj_color1_rgbhsv[6];
-GtkWidget *adj_color1hex;
-GtkWidget *palette[100];
-

=== removed directory 'gui'
=== removed file 'gui/colorbar.c'
--- gui/colorbar.c	2008-11-26 01:33:49 +0000
+++ gui/colorbar.c	1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-/* 
- *  This file is part of Nathive.
- * 
- *  Nathive 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.
- * 
- *  Nathive 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 Nathive.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-
-GtkWidget *colorbar = gtk_vbox_new(FALSE,5);
-gtk_container_set_border_width(GTK_CONTAINER(colorbar), 5);
-
-
-GtkRcStyle *colorbar_rcstyle;
-colorbar_rcstyle = gtk_rc_style_new();
-colorbar_rcstyle->xthickness = colorbar_rcstyle->ythickness = 0;
-
-GtkWidget *colorbar_prev = gtk_button_new();
-//GtkWidget *colorbar_prev_arrow = gtk_arrow_new(GTK_ARROW_UP, GTK_SHADOW_NONE);
-//gtk_button_set_image(GTK_BUTTON(colorbar_prev), colorbar_prev_arrow);
-gtk_widget_modify_style(colorbar_prev, colorbar_rcstyle);
-gtk_widget_set_size_request(colorbar_prev,0,20);
-
-palette[0] = gtk_vbox_new(FALSE,0);
-char palette_path[100];
-sprintf(palette_path, "%s%s", PATH, "palettes/01.xml");
-load_palette_from_xml(palette[0], palette_path);
-
-GtkWidget *colorbar_next = gtk_button_new();
-//GtkWidget *colorbar_next_arrow = gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_NONE);
-//gtk_button_set_image(GTK_BUTTON(colorbar_next), colorbar_next_arrow);
-gtk_widget_modify_style(colorbar_next, colorbar_rcstyle);
-gtk_widget_set_size_request(colorbar_next,0,20);
-
-
-gtk_box_pack_start(GTK_BOX(colorbar),colorbar_prev,FALSE,FALSE,0);
-gtk_box_pack_start(GTK_BOX(colorbar),palette[0],TRUE,TRUE,0);
-gtk_box_pack_start(GTK_BOX(colorbar),colorbar_next,FALSE,FALSE,0);
-

=== removed file 'gui/gui-main.c'
--- gui/gui-main.c	2008-11-26 18:12:53 +0000
+++ gui/gui-main.c	1970-01-01 00:00:00 +0000
@@ -1,65 +0,0 @@
-/* 
- *  This file is part of Nathive.
- * 
- *  Nathive 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.
- * 
- *  Nathive 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 Nathive.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-
-void gui_main(int argc, char *argv[])
-{
-	printf("> loading gtk interface\n");
-	gtk_init(&argc, &argv);
-
-	win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-	g_signal_connect(G_OBJECT(win), "destroy", G_CALLBACK(gtk_quit), NULL);
-	gtk_window_set_position(GTK_WINDOW(win), GTK_WIN_POS_CENTER);
-	gtk_window_set_default_icon_from_file( strcatnew(PATH,"img/icon.png") , NULL);
-	
-	char win_title[100];
-	sprintf(win_title, "Nathive %s", VERSION);
-	gtk_window_set_title(GTK_WINDOW(win), win_title);	
-
-	gtk_window_set_default_size(GTK_WINDOW(win), win_w, win_h);
-	gtk_window_set_focus(GTK_WINDOW(win), NULL);
-	
-	GtkWidget *vbox = gtk_vbox_new(FALSE,0);	
-		#include "menubar.c"
-		#include "headbar.c"
-		GtkWidget *workarea = gtk_hbox_new(FALSE,2);
-			#include "toolbar.c"
-			#include "tabs.c"
-			#include "sidebar.c"
-			#include "colorbar.c"		
-				
-			gtk_box_pack_start(GTK_BOX(workarea),toolbar,FALSE,FALSE,0);
-			gtk_box_pack_start(GTK_BOX(workarea),tabs,TRUE,TRUE,0);
-			gtk_box_pack_start(GTK_BOX(workarea),sidebar,FALSE,FALSE,0);
-			gtk_box_pack_start(GTK_BOX(workarea),colorbar,FALSE,FALSE,0);
-		
-		statusbar = gtk_statusbar_new();
-		
-		gtk_box_pack_start(GTK_BOX(vbox),menubar,FALSE,FALSE,0);
-		gtk_box_pack_start(GTK_BOX(vbox),headbar,FALSE,FALSE,0);
-		gtk_box_pack_start(GTK_BOX(vbox),workarea,TRUE,TRUE,0);
-		gtk_box_pack_start(GTK_BOX(vbox),statusbar,FALSE,FALSE,0);		
-	
-	gtk_container_add(GTK_CONTAINER(win), vbox);	
-	gtk_widget_show_all(win);		
-	
-	sidebar_tool_change(NULL, NULL);	
-	
-	main_load = 1;
-	printf("> waiting for events\n");	
-	gtk_main();
-}

=== removed file 'gui/headbar.c'
--- gui/headbar.c	2008-11-26 01:33:49 +0000
+++ gui/headbar.c	1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-/* 
- *  This file is part of Nathive.
- * 
- *  Nathive 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.
- * 
- *  Nathive 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 Nathive.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-
-GtkWidget* headbar = gtk_toolbar_new();
-gtk_toolbar_set_style(GTK_TOOLBAR(headbar), GTK_TOOLBAR_ICONS);
-
-GtkToolItem* headbar_new = gtk_tool_button_new_from_stock("gtk-new");
-g_signal_connect(G_OBJECT(headbar_new), "clicked", G_CALLBACK(dialog_new), NULL);
-
-GtkToolItem* headbar_open = gtk_tool_button_new_from_stock("gtk-open");
-g_signal_connect(G_OBJECT(headbar_open), "clicked", G_CALLBACK(dialog_open), NULL);
-
-GtkToolItem* headbar_save = gtk_tool_button_new_from_stock("gtk-save");
-g_signal_connect(G_OBJECT(headbar_save), "clicked", G_CALLBACK(save), NULL);
-
-GtkToolItem* headbar_saveas = gtk_tool_button_new_from_stock("gtk-save-as");
-
-GtkToolItem* headbar_fullscreen = gtk_tool_button_new_from_stock("gtk-fullscreen");
-g_signal_connect(G_OBJECT(headbar_fullscreen), "clicked", G_CALLBACK(window_fullscreen), NULL);
-
-GtkToolItem* headbar_sidebar = gtk_tool_button_new_from_stock("gtk-goto-last");
-g_signal_connect(G_OBJECT(headbar_sidebar), "clicked", G_CALLBACK(sidebar_hide), NULL);
-
-GtkToolItem* headbar_break = gtk_separator_tool_item_new();
-
-gtk_toolbar_insert(GTK_TOOLBAR(headbar),headbar_new,-1);
-gtk_toolbar_insert(GTK_TOOLBAR(headbar),headbar_open,-1);
-gtk_toolbar_insert(GTK_TOOLBAR(headbar),headbar_save,-1);
-gtk_toolbar_insert(GTK_TOOLBAR(headbar),headbar_saveas,-1);
-gtk_toolbar_insert(GTK_TOOLBAR(headbar),headbar_break,-1);
-gtk_toolbar_insert(GTK_TOOLBAR(headbar),headbar_fullscreen,-1);
-gtk_toolbar_insert(GTK_TOOLBAR(headbar),headbar_sidebar,-1);
-

=== removed file 'gui/menubar.c'
--- gui/menubar.c	2008-11-26 01:33:49 +0000
+++ gui/menubar.c	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-/* 
- *  This file is part of Nathive.
- * 
- *  Nathive 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.
- * 
- *  Nathive 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 Nathive.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-
-GtkWidget *menubar = gtk_menu_bar_new();
-
-GtkWidget *menubar_file = gtk_menu_item_new_with_label(language[1]);
-	GtkWidget *menubar_file_menu = gtk_menu_new();
-		menubar_item_new(menubar_file_menu, language[2], "gtk-new", "dialog_new");
-		menubar_item_new(menubar_file_menu, language[3], "gtk-open", "dialog_open");
-		menubar_item_new(menubar_file_menu, language[4], "gtk-save", NULL);
-		
-	gtk_menu_item_set_submenu(GTK_MENU_ITEM(menubar_file), menubar_file_menu);
-	gtk_menu_bar_append(GTK_MENU_BAR(menubar), menubar_file);	
-	
-GtkWidget *menubar_edit = gtk_menu_item_new_with_label(language[5]);
-	GtkWidget *menubar_edit_menu = gtk_menu_new();
-		menubar_item_new(menubar_edit_menu, language[6], "gtk-preferences", NULL);
-	
-	gtk_menu_item_set_submenu(GTK_MENU_ITEM(menubar_edit), menubar_edit_menu);		
-	gtk_menu_bar_append(GTK_MENU_BAR(menubar), menubar_edit);
-	
-GtkWidget *menubar_view = gtk_menu_item_new_with_label(language[24]);
-	GtkWidget *menubar_view_menu = gtk_menu_new();
-		menubar_item_new(menubar_view_menu, language[25], "gtk-fullscreen", "window_fullscreen");
-		menubar_item_new(menubar_view_menu, language[26], "gtk-goto-last", "sidebar_hide");
-	
-	gtk_menu_item_set_submenu(GTK_MENU_ITEM(menubar_view), menubar_view_menu);		
-	gtk_menu_bar_append(GTK_MENU_BAR(menubar), menubar_view);
-	
-GtkWidget *menubar_help = gtk_menu_item_new_with_label(language[27]);
-	GtkWidget *menubar_help_menu = gtk_menu_new();
-		menubar_item_new(menubar_help_menu, language[37], "gtk-info", "url_website");
-		menubar_item_new(menubar_help_menu, language[28], "gtk-about", "dialog_about");
-	
-	gtk_menu_item_set_submenu(GTK_MENU_ITEM(menubar_help), menubar_help_menu);		
-	gtk_menu_bar_append(GTK_MENU_BAR(menubar), menubar_help);
-

=== removed file 'gui/sidebar-brush.c'
--- gui/sidebar-brush.c	2008-11-26 01:33:49 +0000
+++ gui/sidebar-brush.c	1970-01-01 00:00:00 +0000
@@ -1,102 +0,0 @@
-/* 
- *  This file is part of Nathive.
- * 
- *  Nathive 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.
- * 
- *  Nathive 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 Nathive.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-
-GtkWidget *sidebar_brush = gtk_vbox_new(FALSE,0);
-
-char *brush_mode_ops[] = {strcatnew(PATH,"img/square.png"), strcatnew(PATH,"img/circle.png")};
-entry_toggle(
-	sidebar_brush, 
-	strcatnew(language[15],":"), 
-	2, 
-	&brush_mode, 
-	brush_mode_ops, 
-	adj_brush_mode, 
-	"brushNew"
-);
-
-entry_separator(sidebar_brush);
-
-adj_brush_size = gtk_adjustment_new(0,0,0,1,1,0);
-entry_spin(
-	sidebar_brush, 
-	strcatnew(language[16],":"), 
-	&brush_size, 
-	1, 
-	100, 
-	"int", 
-	adj_brush_size, 
-	1
-);
-
-adj_brush_fade = gtk_adjustment_new(0,0,0,1,1,0);
-entry_spin(
-	sidebar_brush, 
-	strcatnew(language[17],":"), 
-	&brush_fade, 
-	0, 
-	100, 
-	"int", 
-	adj_brush_fade, 
-	1
-);
-
-adj_brush_opacity = gtk_adjustment_new(0,0,0,1,1,0);
-entry_spin(
-	sidebar_brush, 
-	strcatnew(language[18],":"), 
-	&brush_opacity, 
-	1, 
-	100, 
-	"int", 
-	adj_brush_opacity, 
-	1
-);
-
-entry_separator(sidebar_brush);
-
-adj_brush_space = gtk_combo_box_new_text();
-char *brush_space_ops[] = { language[19], language[20], language[21] };
-entry_combo(
-	sidebar_brush, 
-	strcatnew(language[22],":"), 
-	3, 
-	&brush_space, 
-	brush_space_ops, 
-	adj_brush_space
-);
-
-//entry_check(sidebar_brush, "Antialias", &brush_antialias, NULL);
-
-entry_expand(sidebar_brush);
-entry_separator(sidebar_brush);
-
-GtkWidget *sidebar_brush_footer = gtk_hbox_new(FALSE,0);	
-	entry_clear(sidebar_brush_footer, "clear_brush", 1);
-	
-	/*GtkWidget *sidebar_brush_save = gtk_button_new();
-	gtk_button_set_image(GTK_BUTTON(sidebar_brush_save), gtk_image_new_from_stock("gtk-save", 1));
-	gtk_box_pack_end(GTK_BOX(sidebar_brush_footer),sidebar_brush_save,FALSE,FALSE,0);
-	
-	GtkWidget *sidebar_brush_load = gtk_combo_box_new_text();
-	gtk_combo_box_append_text(GTK_COMBO_BOX(sidebar_brush_load), " ");
-	gtk_combo_box_append_text(GTK_COMBO_BOX(sidebar_brush_load), "saved brush list");
-	gtk_widget_set_size_request(sidebar_brush_load,0,10);	
-	gtk_box_pack_end(GTK_BOX(sidebar_brush_footer),sidebar_brush_load,TRUE,TRUE,0);*/
-	
-gtk_box_pack_start(GTK_BOX(sidebar_brush), sidebar_brush_footer, FALSE,FALSE,0);
-

=== removed file 'gui/sidebar-color.c'
--- gui/sidebar-color.c	2008-11-26 01:33:49 +0000
+++ gui/sidebar-color.c	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-/* 
- *  This file is part of Nathive.
- * 
- *  Nathive 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.
- * 
- *  Nathive 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 Nathive.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-
-GtkWidget *sidebar_color = gtk_vbox_new(FALSE,0);
-gtk_container_set_border_width(GTK_CONTAINER(sidebar_color), 10);
-
-int i_color;
-for(i_color=0; i_color<6; i_color++) adj_color1_rgbhsv[i_color] = gtk_adjustment_new(0,0,0,1,1,0);
-
-entry_spin(sidebar_color, strcatnew(language[9]," (R):"), &color1[0], 0, 255, "uchar", adj_color1_rgbhsv[0], 1);
-entry_spin(sidebar_color, strcatnew(language[10]," (G):"), &color1[1], 0, 255, "uchar", adj_color1_rgbhsv[1], 1);
-entry_spin(sidebar_color, strcatnew(language[11]," (B):"), &color1[2], 0, 255, "uchar", adj_color1_rgbhsv[2], 1);
-
-entry_separator(sidebar_color);
-
-entry_spin(sidebar_color, strcatnew(language[12]," (H):"), &color1hsv[0], 0, 359, "int", adj_color1_rgbhsv[3], 1);
-entry_spin(sidebar_color, strcatnew(language[13]," (S):"), &color1hsv[1], 0, 100, "int", adj_color1_rgbhsv[4], 1);
-entry_spin(sidebar_color, strcatnew(language[14]," (V):"), &color1hsv[2], 0, 100, "int", adj_color1_rgbhsv[5], 1);
-
-entry_separator(sidebar_color);
-
-color1hex = rgb_to_hex(color1[0], color1[1], color1[2]);
-adj_color1hex = gtk_entry_new();
-entry_entry(sidebar_color, strcatnew(language[29],":"), color1hex, 6, "hex_entry", adj_color1hex);
-
-entry_expand(sidebar_color);
-entry_separator(sidebar_color);
-
-GtkWidget *sidebar_color_footer = gtk_hbox_new(FALSE,0);	
-	entry_clear(sidebar_color_footer, "clear_color", 1);
-gtk_box_pack_start(GTK_BOX(sidebar_color), sidebar_color_footer, FALSE,FALSE,0);
-

=== removed file 'gui/sidebar-mask.c'
--- gui/sidebar-mask.c	2008-11-26 01:33:49 +0000
+++ gui/sidebar-mask.c	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-/* 
- *  This file is part of Nathive.
- * 
- *  Nathive 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.
- * 
- *  Nathive 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 Nathive.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-
-GtkWidget *sidebar_mask = gtk_vbox_new(FALSE,0);
-gtk_container_set_border_width(GTK_CONTAINER(sidebar_mask), 10);
-
-GtkWidget* sidebar_mask_some = gtk_label_new("Mask tool parameters,");
-GtkWidget* sidebar_mask_some2 = gtk_label_new("not available yet.");
-
-gtk_box_pack_start(GTK_BOX(sidebar_mask), sidebar_mask_some, FALSE,FALSE,0);
-gtk_box_pack_start(GTK_BOX(sidebar_mask), sidebar_mask_some2, FALSE,FALSE,0);
-

=== removed file 'gui/sidebar-object.c'
--- gui/sidebar-object.c	2008-11-26 01:33:49 +0000
+++ gui/sidebar-object.c	1970-01-01 00:00:00 +0000
@@ -1,68 +0,0 @@
-/* 
- *  This file is part of Nathive.
- * 
- *  Nathive 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.
- * 
- *  Nathive 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 Nathive.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-
-GtkWidget *sidebar_object = gtk_vbox_new(FALSE,5);
-gtk_container_set_border_width(GTK_CONTAINER(sidebar_object), 10);
-
-object_tree_view = gtk_tree_view_new();
-gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(object_tree_view), 0);
-
-	GtkCellRenderer *object_tree_render = gtk_cell_renderer_text_new();
-	
-	gtk_tree_view_insert_column_with_attributes(
-		GTK_TREE_VIEW(object_tree_view),
-		-1,
-		"",
-		object_tree_render,
-		"text",
-		0,
-		NULL
-	);
-	
-	GtkTreeSelection *select = gtk_tree_view_get_selection(GTK_TREE_VIEW(object_tree_view));
-	g_signal_connect(G_OBJECT(select),"changed",G_CALLBACK(object_gui_select_gtd),NULL);
-
-
-gtk_box_pack_start(GTK_BOX(sidebar_object), object_tree_view, TRUE,TRUE,0);
-
-
-GtkWidget *sidebar_object_btn = gtk_hbox_new(FALSE,0);
-	
-	GtkWidget *sidebar_object_btn_new = gtk_button_new();
-	gtk_button_set_image(GTK_BUTTON(sidebar_object_btn_new), gtk_image_new_from_stock("gtk-new",1));
-	gtk_box_pack_start(GTK_BOX(sidebar_object_btn), sidebar_object_btn_new, TRUE,TRUE,0);
-	g_signal_connect_swapped(G_OBJECT(sidebar_object_btn_new), "clicked", G_CALLBACK(object_new), NULL);
-	
-	GtkWidget *sidebar_object_btn_copy = gtk_button_new();
-	gtk_button_set_image(GTK_BUTTON(sidebar_object_btn_copy), gtk_image_new_from_stock("gtk-copy",1));
-	gtk_box_pack_start(GTK_BOX(sidebar_object_btn), sidebar_object_btn_copy, TRUE,TRUE,0);
-	
-	GtkWidget *sidebar_object_btn_up = gtk_button_new();
-	gtk_button_set_image(GTK_BUTTON(sidebar_object_btn_up), gtk_image_new_from_stock("gtk-go-up",1));
-	gtk_box_pack_start(GTK_BOX(sidebar_object_btn), sidebar_object_btn_up, TRUE,TRUE,0);
-	
-	GtkWidget *sidebar_object_btn_down = gtk_button_new();
-	gtk_button_set_image(GTK_BUTTON(sidebar_object_btn_down), gtk_image_new_from_stock("gtk-go-down",1));
-	gtk_box_pack_start(GTK_BOX(sidebar_object_btn), sidebar_object_btn_down, TRUE,TRUE,0);
-	
-	GtkWidget *sidebar_object_btn_del = gtk_button_new();
-	gtk_button_set_image(GTK_BUTTON(sidebar_object_btn_del), gtk_image_new_from_stock("gtk-delete",1));
-	gtk_box_pack_start(GTK_BOX(sidebar_object_btn), sidebar_object_btn_del, TRUE,TRUE,0);
-
-gtk_box_pack_start(GTK_BOX(sidebar_object), sidebar_object_btn, FALSE,FALSE,0);
-

=== removed file 'gui/sidebar-picker.c'
--- gui/sidebar-picker.c	2008-11-26 01:33:49 +0000
+++ gui/sidebar-picker.c	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-/* 
- *  This file is part of Nathive.
- * 
- *  Nathive 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.
- * 
- *  Nathive 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 Nathive.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-
-GtkWidget *sidebar_picker = gtk_vbox_new(FALSE,0);
-gtk_container_set_border_width(GTK_CONTAINER(sidebar_picker), 10);
-
-GtkWidget* sidebar_picker_some = gtk_label_new("Picker tool parameters,");
-GtkWidget* sidebar_picker_some2 = gtk_label_new("not available yet.");
-
-gtk_box_pack_start(GTK_BOX(sidebar_picker), sidebar_picker_some, FALSE,FALSE,0);
-gtk_box_pack_start(GTK_BOX(sidebar_picker), sidebar_picker_some2, FALSE,FALSE,0);
-

=== removed file 'gui/sidebar-select.c'
--- gui/sidebar-select.c	2008-11-26 01:33:49 +0000
+++ gui/sidebar-select.c	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-/* 
- *  This file is part of Nathive.
- * 
- *  Nathive 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.
- * 
- *  Nathive 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 Nathive.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-
-GtkWidget *sidebar_select = gtk_vbox_new(FALSE,0);
-gtk_container_set_border_width(GTK_CONTAINER(sidebar_select), 10);
-
-GtkWidget* sidebar_select_some = gtk_label_new("Select tool parameters,");
-GtkWidget* sidebar_select_some2 = gtk_label_new("not available yet.");
-
-gtk_box_pack_start(GTK_BOX(sidebar_select), sidebar_select_some, FALSE,FALSE,0);
-gtk_box_pack_start(GTK_BOX(sidebar_select), sidebar_select_some2, FALSE,FALSE,0);
-

=== removed file 'gui/sidebar.c'
--- gui/sidebar.c	2008-11-26 18:12:53 +0000
+++ gui/sidebar.c	1970-01-01 00:00:00 +0000
@@ -1,50 +0,0 @@
-/* 
- *  This file is part of Nathive.
- * 
- *  Nathive 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.
- * 
- *  Nathive 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 Nathive.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-
-sidebar = gtk_notebook_new();
-gtk_widget_set_size_request(sidebar, 220, -1);
-
-GtkWidget* sidebar_color_label = gtk_label_new(language[7]);
-#include "sidebar-color.c"
-
-GtkWidget* sidebar_object_label = gtk_label_new(language[8]);
-#include "sidebar-object.c"
-
-GtkWidget* sidebar_tool_label = gtk_label_new(" ");
-	sidebar_tool = gtk_vbox_new(FALSE,0);
-	gtk_container_set_border_width(GTK_CONTAINER(sidebar_tool), 10);
-	#include "sidebar-select.c"
-	#include "sidebar-mask.c"
-	#include "sidebar-picker.c"
-	#include "sidebar-brush.c"	
-	
-	gtk_box_pack_start(GTK_BOX(sidebar_tool), sidebar_select, TRUE,TRUE,0);
-	gtk_box_pack_start(GTK_BOX(sidebar_tool), sidebar_mask, TRUE,TRUE,0);
-	gtk_box_pack_start(GTK_BOX(sidebar_tool), sidebar_picker, TRUE,TRUE,0);
-	gtk_box_pack_start(GTK_BOX(sidebar_tool), sidebar_brush, TRUE,TRUE,0);
-
-	sidebar_tools[0] = sidebar_select;
-	sidebar_tools[1] = sidebar_mask;
-	sidebar_tools[2] = sidebar_picker;
-	sidebar_tools[3] = sidebar_brush;
-
-
-gtk_notebook_append_page(GTK_NOTEBOOK(sidebar), sidebar_color, sidebar_color_label);
-gtk_notebook_append_page(GTK_NOTEBOOK(sidebar), sidebar_object, sidebar_object_label);
-gtk_notebook_append_page(GTK_NOTEBOOK(sidebar), sidebar_tool, sidebar_tool_label);
-

=== removed file 'gui/tabs.c'
--- gui/tabs.c	2008-11-26 01:33:49 +0000
+++ gui/tabs.c	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-/* 
- *  This file is part of Nathive.
- * 
- *  Nathive 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.
- * 
- *  Nathive 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 Nathive.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-
-tabs = gtk_notebook_new();
-gtk_notebook_set_scrollable(GTK_NOTEBOOK(tabs), 1);
-g_signal_connect(G_OBJECT(tabs),"switch-page",G_CALLBACK(tab_change),NULL);
-

=== removed file 'gui/toolbar.c'
--- gui/toolbar.c	2008-11-26 18:12:53 +0000
+++ gui/toolbar.c	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-/* 
- *  This file is part of Nathive.
- * 
- *  Nathive 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.
- * 
- *  Nathive 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 Nathive.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-
-GtkWidget *toolbar = gtk_vbox_new(FALSE,0);
-gtk_container_set_border_width(GTK_CONTAINER(toolbar), 2);
-
-char *toolbar_item_ops[] = { 
-	strcatnew(PATH,"img/select.png"),
-	strcatnew(PATH,"img/mask.png"),
-	strcatnew(PATH,"img/picker.png"),
-	strcatnew(PATH,"img/brush.png") 
-}; 
-toolbar_item(toolbar, TOOLS, toolbar_item_ops);
-
-entry_space(toolbar);
-
-GdkPixbuf *toolbar_color1_pix = pixbuf_new(NULL, 20, 20);
-int toolbar_color1_w = gdk_pixbuf_get_width(toolbar_color1_pix);
-int toolbar_color1_h = gdk_pixbuf_get_height(toolbar_color1_pix);
-
-toolbar_color1[0] = gdk_pixbuf_get_pixels(toolbar_color1_pix);
-toolbar_color1[1] = gtk_image_new_from_pixbuf(toolbar_color1_pix);
-toolbar_color1[2] = &toolbar_color1_w;
-toolbar_color1[3] = &toolbar_color1_h;
-
-gtk_box_pack_start(GTK_BOX(toolbar), toolbar_color1[1], FALSE, FALSE, 0);
-

=== added directory 'img'
=== removed directory 'img'
=== added file 'img/about.png'
Binary files img/about.png	1970-01-01 00:00:00 +0000 and img/about.png	2009-12-12 11:55:22 +0000 differ
=== removed file 'img/about.png'
Binary files img/about.png	2008-11-26 01:33:49 +0000 and img/about.png	1970-01-01 00:00:00 +0000 differ
=== added file 'img/brush.png'
Binary files img/brush.png	1970-01-01 00:00:00 +0000 and img/brush.png	2009-12-12 11:55:22 +0000 differ
=== removed file 'img/brush.png'
Binary files img/brush.png	2008-11-26 01:33:49 +0000 and img/brush.png	1970-01-01 00:00:00 +0000 differ
=== added file 'img/circle.png'
Binary files img/circle.png	1970-01-01 00:00:00 +0000 and img/circle.png	2009-12-12 11:55:22 +0000 differ
=== removed file 'img/circle.png'
Binary files img/circle.png	2008-11-26 01:33:49 +0000 and img/circle.png	1970-01-01 00:00:00 +0000 differ
=== added file 'img/icon.png'
Binary files img/icon.png	1970-01-01 00:00:00 +0000 and img/icon.png	2009-12-12 11:55:22 +0000 differ
=== removed file 'img/icon.png'
Binary files img/icon.png	2008-11-26 01:33:49 +0000 and img/icon.png	1970-01-01 00:00:00 +0000 differ
=== added file 'img/mask.png'
Binary files img/mask.png	1970-01-01 00:00:00 +0000 and img/mask.png	2009-12-12 11:55:22 +0000 differ
=== removed file 'img/mask.png'
Binary files img/mask.png	2008-11-26 01:33:49 +0000 and img/mask.png	1970-01-01 00:00:00 +0000 differ
=== added file 'img/picker.png'
Binary files img/picker.png	1970-01-01 00:00:00 +0000 and img/picker.png	2009-12-12 11:55:22 +0000 differ
=== removed file 'img/picker.png'
Binary files img/picker.png	2008-11-26 01:33:49 +0000 and img/picker.png	1970-01-01 00:00:00 +0000 differ
=== added file 'img/select.png'
Binary files img/select.png	1970-01-01 00:00:00 +0000 and img/select.png	2009-12-12 11:55:22 +0000 differ
=== removed file 'img/select.png'
Binary files img/select.png	2008-11-26 01:33:49 +0000 and img/select.png	1970-01-01 00:00:00 +0000 differ
=== added file 'img/square.png'
Binary files img/square.png	1970-01-01 00:00:00 +0000 and img/square.png	2009-12-12 11:55:22 +0000 differ
=== removed file 'img/square.png'
Binary files img/square.png	2008-11-26 01:33:49 +0000 and img/square.png	1970-01-01 00:00:00 +0000 differ
=== added file 'img/visual.png'
Binary files img/visual.png	1970-01-01 00:00:00 +0000 and img/visual.png	2009-12-12 11:55:22 +0000 differ
=== added file 'img/visual_rotate.png'
Binary files img/visual_rotate.png	1970-01-01 00:00:00 +0000 and img/visual_rotate.png	2009-12-12 11:55:22 +0000 differ
=== added file 'img/visual_scale.png'
Binary files img/visual_scale.png	1970-01-01 00:00:00 +0000 and img/visual_scale.png	2009-12-12 11:55:22 +0000 differ
=== removed directory 'lang'
=== removed file 'lang/chinese.xml'
--- lang/chinese.xml	2008-12-01 07:53:03 +0000
+++ lang/chinese.xml	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<language>
-	<word1>文件</word1>
-	<word2>新建</word2>
-	<word3>打开</word3>
-	<word4>保存</word4>
-	<word5>编辑</word5>
-	<word6>首选项</word6>
-	<word7>颜色</word7>
-	<word8>对象</word8>
-	<word9>红</word9>
-	<word10>绿</word10>
-	<word11>蓝</word11>
-	<word12>色调</word12>
-	<word13>饱和度</word13>
-	<word14>纯度</word14>
-	<word15>形状</word15>
-	<word16>大小</word16>
-	<word17>平滑</word17>
-	<word18>不透明</word18>
-	<word19>常量</word19>
-	<word20>变量</word20>
-	<word21>空闲</word21>
-	<word22>间隔</word22>
-	<word23>还原默认值</word23>
-	<word24>视图</word24>
-	<word25>全屏</word25>
-	<word26>侧边栏</word26>
-	<word27>帮助</word27>
-	<word28>关于</word28>
-	<word29>十六进制</word29>
-	<word30>宽度</word30>
-	<word31>高度</word31>
-	<word32>点/英寸</word32>
-	<word33>无背景</word33>
-	<word34>版本</word34>
-	<word35>致谢</word35>
-	<word36>许可</word36>
-	<word37>Nathive 网站</word37>
-	<word38>未保存</word38>
-	<word39>单位</word39>
-    <word40>像素</word40>
-    <word41>厘米</word41>
-    <word42>英寸</word42>
-    <word43>分辨率</word43>
-    <word44>模板</word44>
-    <word45>CD 封面</word45>
-    <word46>DVD 封面</word46>
-    <word47>很高</word47>
-    <word48>高</word48>
-    <word49>正常</word49>
-    <word50>低</word50>
-    <word51>很低</word51>
-    <word52>笔刷大小</word52>
-    <word53>旋转 90º</word53>
-    <word54>缩小 50%</word54>
-    <word55>放大 200%</word55>
-    <word56>Preview</word56> <!--need translation-->
-</language>

=== removed file 'lang/english.xml'
--- lang/english.xml	2008-12-01 07:53:03 +0000
+++ lang/english.xml	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<language>
-	<word1>File</word1>
-	<word2>New</word2>
-	<word3>Open</word3>
-	<word4>Save</word4>
-	<word5>Edit</word5>
-	<word6>Preferences</word6>
-	<word7>Color</word7>
-	<word8>Objects</word8>
-	<word9>Red</word9>
-	<word10>Green</word10>
-	<word11>Blue</word11>
-	<word12>Hue</word12>
-	<word13>Saturation</word13>
-	<word14>Value</word14>
-	<word15>Shape</word15>
-	<word16>Size</word16>
-	<word17>Smoothing</word17>
-	<word18>Opacity</word18>
-	<word19>Constant</word19>
-	<word20>Variable</word20>
-	<word21>Idle</word21>
-	<word22>Spacing</word22>
-	<word23>Restore default values</word23>
-	<word24>View</word24>
-	<word25>Fullscreen</word25>
-	<word26>Sidebar</word26>
-	<word27>Help</word27>
-	<word28>About</word28>
-	<word29>Hexadecimal</word29>
-	<word30>Width</word30>
-	<word31>Height</word31>
-	<word32>Dots/inche</word32>
-	<word33>No background</word33>
-	<word34>Version</word34>
-	<word35>Credits</word35>
-	<word36>License</word36>
-	<word37>Nathive website</word37>
-	<word38>Unsaved</word38>
-	<word39>Units</word39>
-	<word40>Pixels</word40>
-	<word41>Centimeters</word41>
-	<word42>Inches</word42>
-	<word43>Resolution</word43>
-	<word44>Template</word44>
-	<word45>CD cover</word45>
-	<word46>DVD cover</word46>
-	<word47>Very high</word47>
-	<word48>High</word48>
-	<word49>Normal</word49>
-	<word50>Low</word50>
-	<word51>Very low</word51>
-	<word52>Brush size</word52>
-	<word53>Rotate 90º</word53>
-	<word54>Get 50%</word54>
-	<word55>Get 200%</word55>
-	<word56>Preview</word56>
-</language>

=== removed file 'lang/german.xml'
--- lang/german.xml	2008-12-01 07:53:03 +0000
+++ lang/german.xml	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<language>
-	<word1>Datei</word1>
-	<word2>Neu</word2>
-	<word3>Öffnen</word3>
-	<word4>Speichern</word4>
-	<word5>Bearbeiten</word5>
-	<word6>Einstellungen</word6>
-	<word7>Farbe</word7>
-	<word8>Objekte</word8>
-	<word9>Rot</word9>
-	<word10>Grün</word10>
-	<word11>Blau</word11>
-	<word12>Farbton</word12>
-	<word13>Farbsättigung</word13>
-	<word14>Farbwert</word14>
-	<word15>Form</word15>
-	<word16>Größe</word16>
-	<word17>Weichzeichnung</word17>
-	<word18>Deckkraft</word18>
-	<word19>Konstant</word19>
-	<word20>Variabel</word20>
-	<word21>Ignorieren</word21>
-	<word22>Abstand</word22>
-	<word23>Standardwerte wiederherstellen</word23>
-	<word24>Ansicht</word24>
-	<word25>Vollbild</word25>
-	<word26>Seitenleiste</word26>
-	<word27>Hilfe</word27>
-	<word28>Über</word28>
-	<word29>Hexadezimal</word29>
-	<word30>Breite</word30>
-	<word31>Höhe</word31>
-	<word32>Punkte/Zoll</word32>
-	<word33>Kein Hintergrund</word33>
-	<word34>Version</word34>
-	<word35>Credits</word35>
-	<word36>Lizenz</word36>
-	<word37>Nathive Website</word37>
-	<word38>Ungespeichert</word38>
-	<word39>Einheiten</word39>
-	<word40>Pixel</word40>
-	<word41>Zentimeter</word41>
-	<word42>Zoll</word42>
-	<word43>Auflösung</word43>
-	<word44>Vorlage</word44>
-	<word45>CD-Hülle</word45>
-	<word46>DVD-Hülle</word46>
-	<word47>Sehr hoch</word47>
-	<word48>Hoch</word48>
-	<word49>Normal</word49>
-	<word50>Niedrig</word50>
-	<word51>Sehr niedrig</word51>
-	<word52>Pinselgröße</word52>
-	<word53>Um 90º drehen</word53>
-	<word54>Get 50%</word54>
-	<word55>Get 200%</word55>
-	<word56>Preview</word56> <!--need translation-->
-</language>

=== removed file 'lang/hungarian.xml'
--- lang/hungarian.xml	2008-12-01 07:53:03 +0000
+++ lang/hungarian.xml	1970-01-01 00:00:00 +0000
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<language>
-	<word1>Fájl</word1>
-	<word2>Új</word2>
-	<word3>Megnyitás</word3>
-	<word4>Mentés</word4>
-	<word5>Szerkesztés</word5>
-	<word6>Beállítások</word6>
-	<word7>Szín</word7>
-	<word8>Objektumok</word8>
-	<word9>Piros</word9>
-	<word10>Zöld</word10>
-	<word11>Kék</word11>
-	<word12>Kontraszt</word12>
-	<word13>Fényerő</word13>
-	<word14>Érték</word14>
-	<word15>Alakzat</word15>
-	<word16>Méret</word16>
-	<word17>Simítás</word17>
-	<word18>Áttetszőség</word18>
-	<word19>Állandó</word19>
-	<word20>Változó</word20>
-	<word21>Folyamatban</word21>
-	<word22>Térköz</word22>
-	<word23>Alapértelmezett értékek helyreállítása</word23>
-	<word24>Nézet</word24>
-	<word25>Teljes képernyő</word25>
-	<word26>Oldalpanel</word26>
-	<word27>Súgó</word27>
-	<word28>Programról</word28>
-	<word29>Hexadecimális</word29>
-	<word30>Width</word30>
-	<word31>Height</word31>
-	<word32>Dots/inche</word32>
-	<word33>No background</word33>
-	<word34>Version</word34>
-	<word35>Credits</word35>
-	<word36>License</word36>
-	<word37>Nathive website</word37>
-	<word38>Unsaved</word38>
-	<word39>Mértékegység</word39>
-    <word40>Pixel</word40>
-    <word41>Centiméter</word41>
-    <word42>Coll</word42>
-    <word43>Felbontás</word43>
-    <word44>Sablon</word44>
-    <word45>CD borító</word45>
-    <word46>DVD borító</word46>
-    <word47>Nagyon magas</word47>
-    <word48>Magas</word48>
-    <word49>Normál</word49>
-    <word50>Alacsony</word50>
-    <word51>Nagyon alacsony</word51>
-    <word52>Ecset méret</word52>
-    <word53>Rotate 90º</word53> <!--need translation-->
-	<word54>Get 50%</word54> <!--need translation-->
-	<word55>Get 200%</word55> <!--need translation-->
-</language>

=== removed file 'lang/polish.xml'
--- lang/polish.xml	2008-12-01 07:53:03 +0000
+++ lang/polish.xml	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<language>
-	<word1>Plik</word1>
-	<word2>Nowy</word2>
-	<word3>Otwórz</word3>
-	<word4>Zapisz</word4>
-	<word5>Edycja</word5>
-	<word6>Ustawienia</word6>
-	<word7>Kolor</word7>
-	<word8>Obiekty</word8>
-	<word9>Czerwony</word9>
-	<word10>Zielony</word10>
-	<word11>Niebieski</word11>
-	<word12>Odcień</word12>
-	<word13>Nasycenie</word13>
-	<word14>Wartość</word14>
-	<word15>Kształt</word15>
-	<word16>Rozmiar</word16>
-	<word17>Wygładzenie</word17>
-	<word18>Nieprzezroczystość</word18>
-	<word19>Stały</word19>
-	<word20>Zmienny</word20>
-	<word21>Bezczynny</word21>
-	<word22>Odstęp</word22>
-	<word23>Przywróć domyślne wartości</word23>
-	<word24>Widok</word24>
-	<word25>Pełny ekran</word25>
-	<word26>Pasek boczny</word26>
-	<word27>Pomoc</word27>
-	<word28>O programie</word28>
-	<word29>Szestnastkowy</word29>
-	<word30>Szerokość</word30>
-	<word31>Wysokość</word31>
-	<word32>Punkty/cale</word32>
-	<word33>Bez tła</word33>
-	<word34>Wersja</word34>
-	<word35>Zasłlugi</word35>
-	<word36>Licencja</word36>
-	<word37>Strona domowa Nathive</word37>
-	<word38>Niezapisany</word38>
-	<word39>Jednostki</word39>
-	<word40>Piksele</word40>
-	<word41>Centymetry</word41>
-	<word42>Cale</word42>
-	<word43>Rozdzielczość</word43>
-	<word44>Szablon</word44>
-	<word45>Okładka CD</word45>
-	<word46>Okładka DVD</word46>
-	<word47>Bardzo wysoki</word47>
-	<word48>Wysoki</word48>
-	<word49>Normalnyl</word49>
-	<word50>Niski</word50>
-	<word51>Bardzo niski</word51>
-	<word52>Rozmiar pędzla</word52>
-	<word53>Obróć o 90º</word53>
-	<word54>Zrobić 50%</word54>
-	<word55>Zrobić 200%</word55>
-	<word56>Preview</word56> <!--need translation-->
-</language>

=== removed file 'lang/spanish.xml'
--- lang/spanish.xml	2008-12-01 07:53:03 +0000
+++ lang/spanish.xml	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<language>
-	<word1>Archivo</word1>
-	<word2>Nuevo</word2>
-	<word3>Abrir</word3>
-	<word4>Guardar</word4>
-	<word5>Edición</word5>
-	<word6>Preferencias</word6>
-	<word7>Color</word7>
-	<word8>Objetos</word8>
-	<word9>Rojo</word9>
-	<word10>Verde</word10>
-	<word11>Azul</word11>
-	<word12>Tono</word12>
-	<word13>Saturación</word13>
-	<word14>Brillo</word14>
-	<word15>Forma</word15>
-	<word16>Tamaño</word16>
-	<word17>Fundido</word17>
-	<word18>Opacidad</word18>
-	<word19>Constante</word19>
-	<word20>Variable</word20>
-	<word21>Inactivo</word21>
-	<word22>Espaciado</word22>
-	<word23>Restaurar valores iniciales</word23>
-	<word24>Ver</word24>
-	<word25>Pantalla completa</word25>
-	<word26>Panel lateral</word26>
-	<word27>Ayuda</word27>
-	<word28>Acerca de</word28>
-	<word29>Hexadecimal</word29>
-	<word30>Ancho</word30>
-	<word31>Alto</word31>
-	<word32>Puntos/pulgada</word32>
-	<word33>Sin fondo</word33>
-	<word34>Versión</word34>
-	<word35>Creditos</word35>
-	<word36>Licencia</word36>
-	<word37>Sitio web de Nathive</word37>
-	<word38>No guardado</word38>
-	<word39>Unidades</word39>
-	<word40>Pixeles</word40>
-	<word41>Centímetros</word41>
-	<word42>Pulgadas</word42>
-	<word43>Resolución</word43>
-	<word44>Plantilla</word44>
-	<word45>Portada de CD</word45>
-	<word46>Portada de DVD</word46>
-	<word47>Muy alta</word47>
-	<word48>Alta</word48>
-	<word49>Normal</word49>
-	<word50>Baja</word50>
-	<word51>Muy baja</word51>
-	<word52>Tamaño del pincel</word52>
-	<word53>Rotar 90º</word53>
-	<word54>Obtener 50%</word54>
-	<word55>Obtener 200%</word55>
-	<word56>Vista previa</word56>
-</language>

=== removed directory 'lib'
=== removed file 'lib/cfg.c'
--- lib/cfg.c	2008-11-26 01:33:49 +0000
+++ lib/cfg.c	1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
-/* 
- *  This file is part of Nathive.
- * 
- *  Nathive 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.
- * 
- *  Nathive 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 Nathive.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-
-cfg_load()
-{
-	printf("> loading user cfg\n", language_);
-
-	char *cfg = file_to_str( strcatnew(PATH,"cfg/cfg.xml") );
-	
-	language_ = n_xml_get(cfg, 3, "cfg", "misc", "language");
-	folder_last = n_xml_get(cfg, 3, "cfg", "misc", "folder-last");
-	
-	win_w = atoi( n_xml_get(cfg, 3, "cfg", "misc", "win-w") );
-	win_h = atoi( n_xml_get(cfg, 3, "cfg", "misc", "win-h") );
-	
-	color1[0] = atoi( n_xml_get(cfg, 3, "cfg", "color", "r") );
-	color1[1] = atoi( n_xml_get(cfg, 3, "cfg", "color", "g") );
-	color1[2] = atoi( n_xml_get(cfg, 3, "cfg", "color", "b") );
-	
-	brush_size = atoi(n_xml_get(cfg, 3, "cfg", "brush", "size") );
-	brush_mode = atoi(n_xml_get(cfg, 3, "cfg", "brush", "mode") );
-	brush_fade = atoi(n_xml_get(cfg, 3, "cfg", "brush", "soft") );
-	brush_opacity = atoi(n_xml_get(cfg, 3, "cfg", "brush", "opacity") );
-	brush_space = atoi( n_xml_get(cfg, 3, "cfg", "brush", "space") );
-}

=== removed file 'lib/common.c'
--- lib/common.c	2008-11-26 01:33:49 +0000
+++ lib/common.c	1970-01-01 00:00:00 +0000
@@ -1,111 +0,0 @@
-/* 
- *  This file is part of Nathive.
- * 
- *  Nathive 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.
- * 
- *  Nathive 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 Nathive.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-
-double round(double x)
-{
-	return floor(x+0.5);
-}
-
-
-double log_base(double base, double x)
-{
-	return log(x) / log(base);
-}
-
-
-int max(int a, int b)
-{
-	if(a>b) return a;
-	else return b;
-}
-
-
-int min(int a, int b)
-{
-	if(a>b) return b;
-	else return a;
-}
-
-
-void mark(int num)
-{	
-	printf("%i\n", num);
-}
-
-
-char *file_to_str(char *path)
-{
-	FILE *file = fopen(path,"r");
-	if(!file) 
-	{
-		printf("ERROR: file_to_str: %s can not be opened\n", path);
-		return path;
-	}
-	
-	int n = 0;
-	while(getc(file)!=EOF) n++;
-	rewind(file); 	
-		
-	char *str = (char*)calloc(n+1, sizeof(char));
-	int i;
-	for(i=0; i<n; i++) str[i] = getc(file);
-	str[n+1] = '\0';
-	return str;
-}
-
-
-char *parse(char *str, char *in, char *out)
-{
-	char *inp = strstr(str, in);	
-	char *outp = strstr(str, out);
-	inp+= strlen(in);	
-	
-	int n = outp-inp;
-	if(n<1) return "PARSE ERROR";
-	char *get = (char*)malloc((n+1)*sizeof(char));
-	int i;
-	for(i=0; i<=n; i++) 
-	{
-		if(i<n) get[i] = *(inp+i);
-		else get[i] = '\0';
-	}
-	return get;
-}
-
-
-char *strcatnew(char *s1, char *s2)
-{
-	char *s3 = (char*)malloc(( strlen(s1) + strlen(s2) + 1 )*sizeof(char));
-	sprintf(s3, "%s%s", s1, s2);
-	return s3;
-}
-
-
-int hash_basic(char *str)
-{
-	int hash = 0;
-	int i = 0;
-	while(str[i] != '\0')
-	{
-		hash = (hash + str[i]) * str[i];
-		hash = abs(hash);		
-		i++;
-	}
-	hash *= i;
-	return abs(hash);
-}

=== removed file 'lib/dom.c'
--- lib/dom.c	2008-11-26 01:33:49 +0000
+++ lib/dom.c	1970-01-01 00:00:00 +0000
@@ -1,159 +0,0 @@
-/* 
- *  This file is part of Nathive.
- * 
- *  Nathive 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.
- * 
- *  Nathive 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 Nathive.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-
-int dom_tab()
-{
-	return gtk_notebook_get_current_page(GTK_NOTEBOOK(tabs));
-}
-
-
-char *dom_file_path()
-{
-	return n_tree_get(dom, n_tree_stalk(2, dom_tab(), DOM_PATH) );
-}
-
-
-int *dom_w()
-{
-	int tab = gtk_notebook_get_current_page(GTK_NOTEBOOK(tabs));
-	return n_tree_get(dom, n_tree_stalk(2,tab,DOM_W));
-}
-
-
-int *dom_h()
-{
-	int tab = gtk_notebook_get_current_page(GTK_NOTEBOOK(tabs));
-	return n_tree_get(dom, n_tree_stalk(2,tab,DOM_H));
-}
-
-
-GtkWidget *dom_scroll()
-{
-	int tab = gtk_notebook_get_current_page(GTK_NOTEBOOK(tabs));
-	return n_tree_get(dom, n_tree_stalk(2,tab,DOM_SCROLL));
-}
-
-
-GdkPixbuf *dom_pix()
-{
-	return n_tree_get(dom, n_tree_stalk(2, dom_tab() ,DOM_PIX));
-}
-
-
-GtkWidget *dom_img()
-{
-	int tab = gtk_notebook_get_current_page(GTK_NOTEBOOK(tabs));
-	return n_tree_get(dom, n_tree_stalk(2,tab,DOM_IMG));
-}
-
-
-uchar *dom_raw()
-{
-	int tab = gtk_notebook_get_current_page(GTK_NOTEBOOK(tabs));
-	return n_tree_get(dom, n_tree_stalk(2,tab,DOM_RAW));
-}
-
-
-int *dom_obj_sel(int tab)
-{
-	if(tab==-1) tab = dom_tab();
-	return n_tree_get(dom, n_tree_stalk(3,tab,DOM_OBJ,0));
-}
-
-int dom_obj_count(int tab)
-{
-	if(tab==-1) tab = dom_tab();
-	return n_tree_count(dom, n_tree_stalk(2,tab,DOM_OBJ)) - 1;
-}
-
-
-uchar *dom_obj_raw(int n)
-{
-	int tab = gtk_notebook_get_current_page(GTK_NOTEBOOK(tabs));
-	if(!n) n = *dom_obj_sel(-1);
-	return n_tree_get(dom, n_tree_stalk(4,tab,DOM_OBJ,n,OBJ_RAW));
-}
-
-
-int *dom_obj_w(int n)
-{
-	int tab = gtk_notebook_get_current_page(GTK_NOTEBOOK(tabs));
-	if(!n) n = *dom_obj_sel(-1);
-	return n_tree_get(dom, n_tree_stalk(4,tab,DOM_OBJ,n,OBJ_W));
-}
-
-
-int *dom_obj_h(int n)
-{
-	int tab = gtk_notebook_get_current_page(GTK_NOTEBOOK(tabs));
-	if(!n) n = *dom_obj_sel(-1);
-	return n_tree_get(dom, n_tree_stalk(4,tab,DOM_OBJ,n,OBJ_H));
-}
-
-
-int *dom_obj_x(int n)
-{
-	int tab = gtk_notebook_get_current_page(GTK_NOTEBOOK(tabs));
-	if(!n) n = *dom_obj_sel(-1);
-	return n_tree_get(dom, n_tree_stalk(4,tab,DOM_OBJ,n,OBJ_X));
-}
-
-
-int *dom_obj_y(int n)
-{
-	int tab = gtk_notebook_get_current_page(GTK_NOTEBOOK(tabs));
-	if(!n) n = *dom_obj_sel(-1);
-	return n_tree_get(dom, n_tree_stalk(4,tab,DOM_OBJ,n,OBJ_Y));
-}
-
-
-GtkTreeModel *dom_objgui_model(int n)
-{
-	return n_tree_get(dom, n_tree_stalk(3,n,DOM_OBJGUI,0));
-}
-
-
-GtkListStore *dom_objgui_store(int n)
-{
-	return n_tree_get(dom, n_tree_stalk(3,n,DOM_OBJGUI,1));
-}
-
-
-uchar *dom_mosaic()
-{
-	int tab = gtk_notebook_get_current_page(GTK_NOTEBOOK(tabs));
-	return n_tree_get(dom, n_tree_stalk(3,tab,DOM_PRE,0));
-}
-
-
-int offset_x(int x) //must be out of there
-{
-	GtkWidget *img = dom_img();
-	GtkAllocation imgAlloc = img->allocation;
-	int ox = (imgAlloc.width - *dom_w() )/2;
-	return x-ox;
-}
-
-
-int offset_y(int y) //must be out of there
-{
-	GtkWidget *img = dom_img();
-	GtkAllocation imgAlloc = img->allocation;
-	int oy = (imgAlloc.height - *dom_h() )/2;
-	return y-oy;
-}

=== removed directory 'lib/gui'
=== removed file 'lib/gui/call.c'
--- lib/gui/call.c	2008-11-26 01:33:49 +0000
+++ lib/gui/call.c	1970-01-01 00:00:00 +0000
@@ -1,105 +0,0 @@
-/* 
- *  This file is part of Nathive.
- * 
- *  Nathive 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.
- * 
- *  Nathive 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 Nathive.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-
-call_adj_uchar(GtkAdjustment *adj, uchar *value)
-{
-	*value = (uchar)gtk_adjustment_get_value(adj);
-	if(value==&color1[0] || value==&color1[1] || value==&color1[2])	color_update("rgb");
-	if(!feedback_lock) brush_new();
-}
-
-call_adj_int(GtkAdjustment *adj, int *value)
-{
-	*value = (int)gtk_adjustment_get_value(adj);
-	if(value==&color1hsv[0] || value==&color1hsv[1] || value==&color1hsv[2]) color_update("hsv");
-	if(!feedback_lock) brush_new();
-	if(value==&dialog_new_pxw || value==&dialog_new_pxh) dialog_new_update("px");
-	if(value==&dialog_new_dpi) dialog_new_update("dpi");
-}
-
-
-call_adj_double(GtkAdjustment *adj, double *value)
-{
-	*value = (double)gtk_adjustment_get_value(adj);
-	if(value==&dialog_new_cmw || value==&dialog_new_cmh) dialog_new_update("cm");
-	if(value==&dialog_new_inw || value==&dialog_new_inh) dialog_new_update("in");
-}
-
-
-call_combo(GtkComboBox *combo, int *value)
-{
-	*value = gtk_combo_box_get_active(combo);
-	if(value==&dialog_new_template)	dialog_new_template_load();
-	if(value==&dialog_new_unit)	dialog_new_smartshow();
-}
-
-
-call_check(GtkToggleButton *check, int *value)
-{
-	*value =  gtk_toggle_button_get_active(check);
-}
-
-
-call_radio(GtkComboBox *combo, int *data[])
-{
-	*data[0] = *data[1];
-}
-
-
-call_menu(GtkWidget *widget, GtkMenu *menu, GdkEvent *event)
-{
-	GdkEventButton *event_button = (GdkEventButton*) event;
-	gtk_menu_popup(menu, NULL, NULL, NULL, NULL, event_button->button, event_button->time);
-}
-
-
-call_spinmenu(int *data[])
-{
-	*data[0] = *data[1];
-	
-	if(
-		data[0]==&dialog_new_pxw_ops || data[0]==&dialog_new_pxh_ops ||
-		data[0]==&dialog_new_cmw_ops || data[0]==&dialog_new_cmh_ops ||
-		data[0]==&dialog_new_inw_ops || data[0]==&dialog_new_inh_ops
-	)
-	{
-		if(*data[1]==0) dialog_new_rotate();
-		if(*data[1]==1) dialog_new_porcent(0.50);
-		if(*data[1]==2) dialog_new_porcent(2.00);
-	}
-
-	if(data[0] == &dialog_new_dpi_ops) dialog_new_dpi_load();
-}
-
-
-call_function(GtkWidget *wid, char *call)
-{
-	if(call=="brushNew") brush_new();
-	else if(call=="dialog_new") dialog_new();
-	else if(call=="dialog_open") dialog_open();
-	else if(call=="dialog_about") dialog_about();
-	else if(call=="clear_color") clear_color();
-	else if(call=="clear_brush") clear_brush();
-	else if(call=="clear_new") clear_new();	
-	else if(call=="window_fullscreen") window_fullscreen();
-	else if(call=="sidebar_hide") sidebar_hide();
-	else if(call=="hex_entry") color_update("hex");
-	else if(call=="url_website") system("x-www-browser http://www.nathive.org");
-	
-	else printf("ERROR: call_function: Not match found\n");
-}

=== removed file 'lib/gui/clear.c'
--- lib/gui/clear.c	2008-11-26 01:33:49 +0000
+++ lib/gui/clear.c	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-/* 
- *  This file is part of Nathive.
- * 
- *  Nathive 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.
- * 
- *  Nathive 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 Nathive.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-
-clear_brush()
-{
-	brush_mode = 1;
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(adj_brush_mode[brush_mode]), 1);
-	gtk_adjustment_set_value(GTK_ADJUSTMENT(adj_brush_size), 25);
-	gtk_adjustment_set_value(GTK_ADJUSTMENT(adj_brush_fade), 50);
-	gtk_adjustment_set_value(GTK_ADJUSTMENT(adj_brush_opacity), 100);
-	gtk_combo_box_set_active(GTK_COMBO_BOX(adj_brush_space), 0);	
-	brush_new();
-}
-
-
-clear_color()
-{
-	gtk_adjustment_set_value(GTK_ADJUSTMENT(adj_color1_rgbhsv[0]), 0);
-	gtk_adjustment_set_value(GTK_ADJUSTMENT(adj_color1_rgbhsv[1]), 0);
-	gtk_adjustment_set_value(GTK_ADJUSTMENT(adj_color1_rgbhsv[2]), 0);
-}
-
-clear_new()
-{
-	gtk_combo_box_set_active(GTK_COMBO_BOX(dialog_new_unit_combo), 0);
-	gtk_adjustment_set_value(GTK_ADJUSTMENT(dialog_new_adj[2]), 150);
-	gtk_adjustment_set_value(GTK_ADJUSTMENT(dialog_new_adj[1]), 300);
-	gtk_adjustment_set_value(GTK_ADJUSTMENT(dialog_new_adj[0]), 400);		
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dialog_new_nobg_check), 0);
-	dialog_new_update("px");
-}

=== removed file 'lib/gui/color.c'
--- lib/gui/color.c	2008-11-26 01:33:49 +0000
+++ lib/gui/color.c	1970-01-01 00:00:00 +0000
@@ -1,165 +0,0 @@
-/* 
- *  This file is part of Nathive.
- * 
- *  Nathive 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.
- * 
- *  Nathive 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 Nathive.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-
-color_update(char *seed)
-{
-	if(seed=="rgb" && !feedback_lock)
-	{
-		feedback_lock = 1;
-		int *return_hsv = rgb_to_hsv(color1[0], color1[1], color1[2]);
-		color1hsv[0] = return_hsv[0];
-		color1hsv[1] = return_hsv[1];
-		color1hsv[2] = return_hsv[2];
-		free(return_hsv);
-		gtk_adjustment_set_value(GTK_ADJUSTMENT(adj_color1_rgbhsv[3]), color1hsv[0]);
-		gtk_adjustment_set_value(GTK_ADJUSTMENT(adj_color1_rgbhsv[4]), color1hsv[1]);
-		gtk_adjustment_set_value(GTK_ADJUSTMENT(adj_color1_rgbhsv[5]), color1hsv[2]);
-		if(GTK_IS_ENTRY(adj_color1hex))
-		{
-			color1hex = rgb_to_hex(color1[0], color1[1], color1[2]);
-			gtk_entry_set_text(GTK_ENTRY(adj_color1hex), color1hex);
-			free(color1hex);
-		}
-		feedback_lock = 0;
-	}
-	if(seed=="hsv" && !feedback_lock)
-	{
-		feedback_lock = 1;
-		uchar *return_rgb = hsv_to_rgb(color1hsv[0], color1hsv[1], color1hsv[2]);
-		color1[0] = return_rgb[0];
-		color1[1] = return_rgb[1];
-		color1[2] = return_rgb[2];
-		free(return_rgb);
-		if(main_load)
-		{
-			gtk_adjustment_set_value(GTK_ADJUSTMENT(adj_color1_rgbhsv[0]), color1[0]);
-			gtk_adjustment_set_value(GTK_ADJUSTMENT(adj_color1_rgbhsv[1]), color1[1]);
-			gtk_adjustment_set_value(GTK_ADJUSTMENT(adj_color1_rgbhsv[2]), color1[2]);	
-		}
-		if(GTK_IS_ENTRY(adj_color1hex))
-		{
-			color1hex = rgb_to_hex(color1[0], color1[1], color1[2]);
-			gtk_entry_set_text(GTK_ENTRY(adj_color1hex), color1hex);
-			free(color1hex);
-		}	
-		feedback_lock = 0;
-	}
-	if(seed=="hex" && !feedback_lock)
-	{
-		feedback_lock = 1;
-		color1hex = (char*)gtk_entry_get_text(GTK_ENTRY(adj_color1hex));
-		uchar *rgb = hex_to_rgb(color1hex);
-		color1[0] = rgb[0];
-		color1[1] = rgb[1];
-		color1[2] = rgb[2];
-		
-		gtk_adjustment_set_value(GTK_ADJUSTMENT(adj_color1_rgbhsv[0]), color1[0]);
-		gtk_adjustment_set_value(GTK_ADJUSTMENT(adj_color1_rgbhsv[1]), color1[1]);
-		gtk_adjustment_set_value(GTK_ADJUSTMENT(adj_color1_rgbhsv[2]), color1[2]);
-		
-		int *return_hsv = rgb_to_hsv(color1[0], color1[1], color1[2]);
-		color1hsv[0] = return_hsv[0];
-		color1hsv[1] = return_hsv[1];
-		color1hsv[2] = return_hsv[2];
-		free(return_hsv);
-		gtk_adjustment_set_value(GTK_ADJUSTMENT(adj_color1_rgbhsv[3]), color1hsv[0]);
-		gtk_adjustment_set_value(GTK_ADJUSTMENT(adj_color1_rgbhsv[4]), color1hsv[1]);
-		gtk_adjustment_set_value(GTK_ADJUSTMENT(adj_color1_rgbhsv[5]), color1hsv[2]);
-		brush_new();
-		feedback_lock = 0;
-	}
-
-	uchar *raw = toolbar_color1[0];
-	GtkWidget *img = toolbar_color1[1];
-	int w = *(int*)toolbar_color1[2];
-	int h = *(int*)toolbar_color1[3];
-	int x, y;
-	for(y=0; y<h; y++)
-	{
-		for(x=0; x<w; x++)
-		{
-			int pos = pixel_pos(x, y, w);
-			if(x!=0 && y!=0 && x!=w-1 && y!=h-1)
-			{
-				*(raw+pos+0) = color1[0];
-				*(raw+pos+1) = color1[1];
-				*(raw+pos+2) = color1[2];
-				*(raw+pos+3) = 255;				
-			}
-			else
-			{
-				*(raw+pos+0) = 0;
-				*(raw+pos+1) = 0;
-				*(raw+pos+2) = 0;
-				*(raw+pos+3) = 255;	
-			}
-		}
-	}
-	gtk_widget_queue_draw(img);
-}
-
-
-colorbar_select(GtkWidget *wid, GdkEventButton *event, uchar data[3])
-{
-	color1[0] = data[0];
-	color1[1] = data[1];
-	color1[2] = data[2];
-	gtk_adjustment_set_value(GTK_ADJUSTMENT(adj_color1_rgbhsv[0]), color1[0]);
-	gtk_adjustment_set_value(GTK_ADJUSTMENT(adj_color1_rgbhsv[1]), color1[1]);
-	gtk_adjustment_set_value(GTK_ADJUSTMENT(adj_color1_rgbhsv[2]), color1[2]);
-}
-
-
-colorbar_item(GtkWidget *colorbar, uchar r, uchar g, uchar b)
-{
-	GtkWidget *ebox = gtk_event_box_new();
-	gtk_widget_set_size_request(ebox,20,-1);
-	
-	GdkColor *color = (GdkColor*)malloc(sizeof(GdkColor));
-	color->red = (guint16)r*257;
-	color->green = (guint16)g*257;
-	color->blue = (guint16)b*257;
-
-	gtk_widget_modify_bg(ebox, GTK_STATE_NORMAL, color);
-		
-	uchar *data = (uchar*)malloc(3*sizeof(uchar));
-	data[0] = r;
-	data[1] = g;
-	data[2] = b;
-	g_signal_connect(G_OBJECT(ebox), "button-press-event", G_CALLBACK(colorbar_select), data);
-	gtk_box_pack_start(GTK_BOX(colorbar),ebox,TRUE,TRUE,0);
-}
-
-
-void load_palette_from_xml(GtkWidget *palette_, char *path)
-{
-	char *xml = file_to_str(path);
-	
-	int colors = atoi( n_xml_get(xml, 2, "palette", "colors") );
-	
-	char colornn[7];
-	int i;	
-	for(i=1; i<=colors; i++)
-	{
-		sprintf(colornn, "color%i", i);
-		char *hex = n_xml_get(xml, 2, "palette", colornn);
-		uchar *rgb = hex_to_rgb(hex);
-		colorbar_item(palette_, rgb[0], rgb[1], rgb[2]);		
-		free(rgb);
-	}
-}

=== removed file 'lib/gui/cursor.c'
--- lib/gui/cursor.c	2008-11-26 01:33:49 +0000
+++ lib/gui/cursor.c	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-/* 
- *  This file is part of Nathive.
- * 
- *  Nathive 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.
- * 
- *  Nathive 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 Nathive.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-
-cursor_stock(GdkCursorType stock)
-{
-	GdkWindow *winGdk = win->window;
-	GdkDisplay *display = gdk_display_get_default();
-	GdkCursor *cursor = gdk_cursor_new(stock);
-	gdk_window_set_cursor(winGdk, cursor);
-}
-
-
-cursor_pixbuf(char *path)
-{
-	GdkWindow *winGdk = win->window;
-	GdkDisplay *display = gdk_display_get_default();
-	GdkPixbuf *pix = gdk_pixbuf_new_from_file(path, NULL);
-	GdkCursor *cursor = gdk_cursor_new_from_pixbuf(display, pix, 0, 0);
-	gdk_window_set_cursor(winGdk, cursor);
-}
-
-
-cursor_default()
-{
-	GdkWindow *winGdk = win->window;
-	gdk_window_set_cursor(winGdk, NULL);
-}

=== removed file 'lib/gui/dialog.c'
--- lib/gui/dialog.c	2008-12-01 07:53:03 +0000
+++ lib/gui/dialog.c	1970-01-01 00:00:00 +0000
@@ -1,521 +0,0 @@
-/* 
- *  This file is part of Nathive.
- * 
- *  Nathive 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.
- * 
- *  Nathive 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 Nathive.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-
-dialog_new_template_load()
-{
-	feedback_lock = 1;
-	if(dialog_new_template == 1) // A3
-	{
-		gtk_adjustment_set_value(GTK_ADJUSTMENT(dialog_new_adj[3]), 29.7);
-		gtk_adjustment_set_value(GTK_ADJUSTMENT(dialog_new_adj[4]), 42.0);
-		gtk_adjustment_set_value(GTK_ADJUSTMENT(dialog_new_adj[2]), 150);
-		feedback_lock = 0;
-		dialog_new_update("cm-refresh");
-	}
-	if(dialog_new_template == 2) // a4
-	{
-		gtk_adjustment_set_value(GTK_ADJUSTMENT(dialog_new_adj[3]), 21.0);
-		gtk_adjustment_set_value(GTK_ADJUSTMENT(dialog_new_adj[4]), 29.7);
-		gtk_adjustment_set_value(GTK_ADJUSTMENT(dialog_new_adj[2]), 150);
-		feedback_lock = 0;
-		dialog_new_update("cm-refresh");
-	}
-	if(dialog_new_template == 3) // a5
-	{
-		gtk_adjustment_set_value(GTK_ADJUSTMENT(dialog_new_adj[3]), 14.8);
-		gtk_adjustment_set_value(GTK_ADJUSTMENT(dialog_new_adj[4]), 21.0);
-		gtk_adjustment_set_value(GTK_ADJUSTMENT(dialog_new_adj[2]), 150);
-		feedback_lock = 0;
-		dialog_new_update("cm-refresh");
-	}
-	if(dialog_new_template == 4) // cd cover
-	{
-		gtk_adjustment_set_value(GTK_ADJUSTMENT(dialog_new_adj[3]), 12.1);
-		gtk_adjustment_set_value(GTK_ADJUSTMENT(dialog_new_adj[4]), 12.0);
-		gtk_adjustment_set_value(GTK_ADJUSTMENT(dialog_new_adj[2]), 150);
-		feedback_lock = 0;
-		dialog_new_update("cm-refresh");
-	}
-	if(dialog_new_template == 5) // dvd cover
-	{
-		gtk_adjustment_set_value(GTK_ADJUSTMENT(dialog_new_adj[3]), 27.2);
-		gtk_adjustment_set_value(GTK_ADJUSTMENT(dialog_new_adj[4]), 18.4);
-		gtk_adjustment_set_value(GTK_ADJUSTMENT(dialog_new_adj[2]), 150);
-		feedback_lock = 0;
-		dialog_new_update("cm-refresh");
-	}
-	if(dialog_new_template == 6) // dvd cover slim
-	{
-		gtk_adjustment_set_value(GTK_ADJUSTMENT(dialog_new_adj[3]), 26.7);
-		gtk_adjustment_set_value(GTK_ADJUSTMENT(dialog_new_adj[4]), 18.4);
-		gtk_adjustment_set_value(GTK_ADJUSTMENT(dialog_new_adj[2]), 150);
-		feedback_lock = 0;
-		dialog_new_update("cm-refresh");
-	}
-}
-
-
-dialog_new_rotate()
-{
-	if(dialog_new_pxw_ops != -1 || dialog_new_pxh_ops != -1)
-	{
-		int temp = dialog_new_pxw;
-		dialog_new_pxw = dialog_new_pxh;
-		dialog_new_pxh = temp;
-		dialog_new_pxw_ops = dialog_new_pxh_ops = -1;
-		gtk_adjustment_set_value(GTK_ADJUSTMENT(dialog_new_adj[0]), dialog_new_pxw);
-		gtk_adjustment_set_value(GTK_ADJUSTMENT(dialog_new_adj[1]), dialog_new_pxh);
-		dialog_new_update("px");
-	}
-	if(dialog_new_cmw_ops != -1 || dialog_new_cmh_ops != -1)
-	{
-		double temp = dialog_new_cmw;
-		dialog_new_cmw = dialog_new_cmh;
-		dialog_new_cmh = temp;
-		dialog_new_cmw_ops = dialog_new_cmh_ops = -1;
-		gtk_adjustment_set_value(GTK_ADJUSTMENT(dialog_new_adj[3]), dialog_new_cmw);
-		gtk_adjustment_set_value(GTK_ADJUSTMENT(dialog_new_adj[4]), dialog_new_cmh);
-		dialog_new_update("cm");
-	}
-	if(dialog_new_inw_ops != -1 || dialog_new_inh_ops != -1)
-	{
-		double temp = dialog_new_inw;
-		dialog_new_inw = dialog_new_inh;
-		dialog_new_inh = temp;
-		dialog_new_inw_ops = dialog_new_inh_ops = -1;
-		gtk_adjustment_set_value(GTK_ADJUSTMENT(dialog_new_adj[5]), dialog_new_inw);
-		gtk_adjustment_set_value(GTK_ADJUSTMENT(dialog_new_adj[6]), dialog_new_inh);
-		dialog_new_update("in");
-	}
-}
-
-
-dialog_new_porcent(double mod)
-{
-	if(dialog_new_pxw_ops != -1 || dialog_new_pxh_ops != -1)
-	{
-		if(dialog_new_pxw_ops != -1) dialog_new_pxw *= mod;
-		if(dialog_new_pxh_ops != -1) dialog_new_pxh *= mod;
-		dialog_new_pxw_ops = dialog_new_pxh_ops = -1;
-		gtk_adjustment_set_value(GTK_ADJUSTMENT(dialog_new_adj[0]), dialog_new_pxw);
-		gtk_adjustment_set_value(GTK_ADJUSTMENT(dialog_new_adj[1]), dialog_new_pxh);
-		dialog_new_update("px");
-	}
-	if(dialog_new_cmw_ops != -1 || dialog_new_cmh_ops != -1)
-	{
-		if(dialog_new_cmw_ops != -1) dialog_new_cmw *= mod;
-		if(dialog_new_cmh_ops != -1) dialog_new_cmh *= mod;
-		dialog_new_cmw_ops = dialog_new_cmh_ops = -1;
-		gtk_adjustment_set_value(GTK_ADJUSTMENT(dialog_new_adj[3]), dialog_new_cmw);
-		gtk_adjustment_set_value(GTK_ADJUSTMENT(dialog_new_adj[4]), dialog_new_cmh);
-		dialog_new_update("cm");
-	}
-	if(dialog_new_inw_ops != -1 || dialog_new_inh_ops != -1)
-	{
-		if(dialog_new_inw_ops != -1) dialog_new_inw *= mod;
-		if(dialog_new_inh_ops != -1) dialog_new_inh *= mod;
-		dialog_new_inw_ops = dialog_new_inh_ops = -1;
-		gtk_adjustment_set_value(GTK_ADJUSTMENT(dialog_new_adj[5]), dialog_new_inw);
-		gtk_adjustment_set_value(GTK_ADJUSTMENT(dialog_new_adj[6]), dialog_new_inh);
-		dialog_new_update("in");
-	}
-}
-
-
-dialog_new_dpi_load()
-{
-	if(dialog_new_dpi_ops==0) dialog_new_dpi = 600;
-	if(dialog_new_dpi_ops==1) dialog_new_dpi = 300;
-	if(dialog_new_dpi_ops==2) dialog_new_dpi = 150;
-	if(dialog_new_dpi_ops==3) dialog_new_dpi = 92;
-	if(dialog_new_dpi_ops==4) dialog_new_dpi = 72;
-	gtk_adjustment_set_value(GTK_ADJUSTMENT(dialog_new_adj[2]), dialog_new_dpi);
-	dialog_new_dpi_ops = -1;
-}
-
-
-dialog_new_smartshow()
-{
-	gtk_widget_hide(dialog_new_box_px);	
-	gtk_widget_hide(dialog_new_box_cm);
-	gtk_widget_hide(dialog_new_box_in);
-	if(dialog_new_unit == 0) gtk_widget_show(dialog_new_box_px);
-	if(dialog_new_unit == 1) gtk_widget_show(dialog_new_box_cm);
-	if(dialog_new_unit == 2) gtk_widget_show(dialog_new_box_in);
-	
-	/*if(dialog_new_unit == 0) gtk_widget_set_sensitive(dialog_new_box_re, 0);
-	else gtk_widget_set_sensitive(dialog_new_box_re, 1);*/
-}
-
-
-dialog_new_update(char *seed)
-{
-	if(!feedback_lock)
-	{
-		feedback_lock = 1;
-		
-		if(seed!="unit" && !strstr(seed,"refresh"))
-		{
-			gtk_combo_box_set_active(GTK_COMBO_BOX(dialog_new_template_combo), 0);
-		}		
-		if(seed=="px-refresh") seed="px";
-		if(seed=="cm-refresh") seed="cm";
-		if(seed=="in-refresh") seed="in";
-			
-		if(seed=="px")
-		{			
-			dialog_new_cmw = px_to_cm(dialog_new_pxw, dialog_new_dpi);
-			dialog_new_cmh = px_to_cm(dialog_new_pxh, dialog_new_dpi);		
-			gtk_adjustment_set_value(GTK_ADJUSTMENT(dialog_new_adj[3]), dialog_new_cmw);
-			gtk_adjustment_set_value(GTK_ADJUSTMENT(dialog_new_adj[4]), dialog_new_cmh);
-			dialog_new_inw = px_to_in(dialog_new_pxw, dialog_new_dpi);
-			dialog_new_inh = px_to_in(dialog_new_pxh, dialog_new_dpi);		
-			gtk_adjustment_set_value(GTK_ADJUSTMENT(dialog_new_adj[5]), dialog_new_inw);
-			gtk_adjustment_set_value(GTK_ADJUSTMENT(dialog_new_adj[6]), dialog_new_inh);	
-		}
-		if(seed=="cm")
-		{
-			dialog_new_pxw = cm_to_px(dialog_new_cmw, dialog_new_dpi);
-			dialog_new_pxh = cm_to_px(dialog_new_cmh, dialog_new_dpi);
-			gtk_adjustment_set_value(GTK_ADJUSTMENT(dialog_new_adj[0]), dialog_new_pxw);
-			gtk_adjustment_set_value(GTK_ADJUSTMENT(dialog_new_adj[1]), dialog_new_pxh);
-			dialog_new_inw = cm_to_in(dialog_new_cmw);
-			dialog_new_inh = cm_to_in(dialog_new_cmh);		
-			gtk_adjustment_set_value(GTK_ADJUSTMENT(dialog_new_adj[5]), dialog_new_inw);
-			gtk_adjustment_set_value(GTK_ADJUSTMENT(dialog_new_adj[6]), dialog_new_inh);
-		}
-		if(seed=="in")
-		{
-			dialog_new_pxw = in_to_px(dialog_new_inw, dialog_new_dpi);
-			dialog_new_pxh = in_to_px(dialog_new_inh, dialog_new_dpi);
-			gtk_adjustment_set_value(GTK_ADJUSTMENT(dialog_new_adj[0]), dialog_new_pxw);
-			gtk_adjustment_set_value(GTK_ADJUSTMENT(dialog_new_adj[1]), dialog_new_pxh);
-			dialog_new_cmw = in_to_cm(dialog_new_inw);
-			dialog_new_cmh = in_to_cm(dialog_new_inh);		
-			gtk_adjustment_set_value(GTK_ADJUSTMENT(dialog_new_adj[3]), dialog_new_cmw);
-			gtk_adjustment_set_value(GTK_ADJUSTMENT(dialog_new_adj[4]), dialog_new_cmh);		
-		}
-		if(seed=="dpi")
-		{
-			if(dialog_new_unit == 0) 
-			{
-				dialog_new_cmw = px_to_cm(dialog_new_pxw, dialog_new_dpi);
-				dialog_new_cmh = px_to_cm(dialog_new_pxh, dialog_new_dpi);		
-				gtk_adjustment_set_value(GTK_ADJUSTMENT(dialog_new_adj[3]), dialog_new_cmw);
-				gtk_adjustment_set_value(GTK_ADJUSTMENT(dialog_new_adj[4]), dialog_new_cmh);
-				dialog_new_inw = px_to_in(dialog_new_pxw, dialog_new_dpi);
-				dialog_new_inh = px_to_in(dialog_new_pxh, dialog_new_dpi);		
-				gtk_adjustment_set_value(GTK_ADJUSTMENT(dialog_new_adj[5]), dialog_new_inw);
-				gtk_adjustment_set_value(GTK_ADJUSTMENT(dialog_new_adj[6]), dialog_new_inh);
-			}
-			if(dialog_new_unit == 1) 
-			{
-				dialog_new_pxw = cm_to_px(dialog_new_cmw, dialog_new_dpi);
-				dialog_new_pxh = cm_to_px(dialog_new_cmh, dialog_new_dpi);
-			}
-			if(dialog_new_unit == 2)
-			{
-				dialog_new_pxw = in_to_px(dialog_new_inw, dialog_new_dpi);
-				dialog_new_pxh = in_to_px(dialog_new_inh, dialog_new_dpi);
-			}
-			gtk_adjustment_set_value(GTK_ADJUSTMENT(dialog_new_adj[0]), dialog_new_pxw);
-			gtk_adjustment_set_value(GTK_ADJUSTMENT(dialog_new_adj[1]), dialog_new_pxh);
-		}
-		feedback_lock = 0;
-	}
-}
-
-
-dialog_new_call(GtkWidget *btn, GtkWidget *dialog)
-{
-	destroy(NULL, dialog);
-	tab_open(NULL, dialog_new_pxw, dialog_new_pxh,  dialog_new_nobg);
-}
-
-
-dialog_new()
-{
-	GtkWidget *dialog = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-	gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
-	gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER_ALWAYS);
-	gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
-	gtk_window_set_title(GTK_WINDOW(dialog), language[2]);
-	gtk_container_set_border_width(GTK_CONTAINER(dialog), 10);
-	GtkWidget *vbox = gtk_vbox_new(FALSE,5);
-	
-		dialog_new_template_combo = gtk_combo_box_new_text();
-		char *dialog_new_template_ops[] = { 
-			"", 
-			"DIN A3",
-			"DIN A4", 
-			"DIN A5", 
-			language[45],
-			language[46],
-			strcatnew(language[46]," (slim)")
-		};
-		entry_combo(
-			vbox, 
-			strcatnew(language[44],":"), 
-			7, 
-			&dialog_new_template, 
-			dialog_new_template_ops, 
-			dialog_new_template_combo
-		);
-		
-		entry_separator(vbox);
-	
-		dialog_new_unit_combo = gtk_combo_box_new_text();
-		char *dialog_new_unit_ops[] = { language[40], language[41], language[42] };
-		entry_combo(vbox, strcatnew(language[39],":"), 3, &dialog_new_unit, dialog_new_unit_ops, dialog_new_unit_combo);
-
-
-		int i;
-		for(i=0; i<7; i++) dialog_new_adj[i] = gtk_adjustment_new(0,0,0,1,1,0);
-		
-		char *px_ops[] = {language[53], language[54], language[55]};
-		GtkWidget *pxw_menu = gtk_menu_new();
-		GtkWidget *pxh_menu = gtk_menu_new(); 
-		GtkWidget *cmw_menu = gtk_menu_new();
-		GtkWidget *cmh_menu = gtk_menu_new();
-		GtkWidget *inw_menu = gtk_menu_new();
-		GtkWidget *inh_menu = gtk_menu_new(); 
-	
-		dialog_new_box_px = gtk_vbox_new(FALSE,5);
-			entry_spinmenu(dialog_new_box_px, strcatnew(language[30]," (px):"), &dialog_new_pxw, 1, 10000, "int", dialog_new_adj[0], 3, &dialog_new_pxw_ops, px_ops, pxw_menu);
-			entry_spinmenu(dialog_new_box_px, strcatnew(language[31]," (px):"), &dialog_new_pxh, 1, 10000, "int", dialog_new_adj[1], 3, &dialog_new_pxh_ops, px_ops, pxh_menu);
-		gtk_box_pack_start(GTK_BOX(vbox), dialog_new_box_px, FALSE, FALSE, 0);
-		
-		feedback_lock = 1;		
-		dialog_new_box_cm = gtk_vbox_new(FALSE,5);
-			entry_spinmenu(dialog_new_box_cm, strcatnew(language[30]," (cm):"), &dialog_new_cmw, 1, 1000, "double", dialog_new_adj[3], 3, &dialog_new_cmw_ops, px_ops, cmw_menu);
-			entry_spinmenu(dialog_new_box_cm, strcatnew(language[31]," (cm):"), &dialog_new_cmh, 1, 1000, "double", dialog_new_adj[4], 3, &dialog_new_cmh_ops, px_ops, cmh_menu);
-		gtk_box_pack_start(GTK_BOX(vbox), dialog_new_box_cm, FALSE, FALSE, 0);
-		
-		dialog_new_box_in = gtk_vbox_new(FALSE,5);
-			entry_spinmenu(dialog_new_box_in, strcatnew(language[30]," (in):"), &dialog_new_inw, 1, 1000, "double", dialog_new_adj[5], 3, &dialog_new_inw_ops, px_ops, inw_menu);
-			entry_spinmenu(dialog_new_box_in, strcatnew(language[31]," (in):"), &dialog_new_inh, 1, 1000, "double", dialog_new_adj[6], 3, &dialog_new_inh_ops, px_ops, inh_menu);
-		gtk_box_pack_start(GTK_BOX(vbox), dialog_new_box_in, FALSE, FALSE, 0);
-		
-		dialog_new_box_re = gtk_vbox_new(FALSE,5);
-			char *re_ops[] = {
-				strcatnew(language[47], " (600)"), 
-				strcatnew(language[48], " (300)"), 
-				strcatnew(language[49], " (150)"), 
-				strcatnew(language[50], " (92)"), 
-				strcatnew(language[51], " (72)"), 
-			};
-			GtkWidget *re_menu = gtk_menu_new();
-			entry_spinmenu(dialog_new_box_re, strcatnew(language[43]," (dpi):"), &dialog_new_dpi, 1, 10000, "int", dialog_new_adj[2], 5, &dialog_new_dpi_ops, re_ops, re_menu);
-		gtk_box_pack_start(GTK_BOX(vbox), dialog_new_box_re, FALSE, FALSE, 0);	
-		feedback_lock = 0;
-				
-		
-		entry_separator(vbox);
-		
-		dialog_new_nobg_check = gtk_check_button_new();
-		entry_check(vbox, strcatnew(language[33],":"), &dialog_new_nobg, dialog_new_nobg_check, NULL);
-		
-		entry_space(vbox);
-	
-		GtkWidget *buttons = gtk_hbox_new(FALSE,5);
-			
-			GtkWidget *ok = gtk_button_new_from_stock("gtk-ok");
-			g_signal_connect(G_OBJECT(ok), "clicked", G_CALLBACK(dialog_new_call), dialog);
-					
-			GtkWidget *cancel = gtk_button_new_from_stock("gtk-cancel");
-			g_signal_connect(G_OBJECT(cancel), "clicked", G_CALLBACK(destroy), dialog);
-			
-			gtk_box_pack_end(GTK_BOX(buttons),ok,TRUE,TRUE,0);
-			gtk_box_pack_end(GTK_BOX(buttons),cancel,TRUE,TRUE,0);			
-			entry_clear(buttons, "clear_new", 2);				
-		
-		gtk_box_pack_start(GTK_BOX(vbox),buttons,FALSE,FALSE,0);
-
-	gtk_container_add(GTK_CONTAINER(dialog), vbox);
-	gtk_widget_show_all(dialog);
-	dialog_new_smartshow();
-}
-
-
-dialog_open_path(GtkWidget *widget, GtkWidget *dialog)
-{
-	gchar *path = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
-	folder_last = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(dialog));
-	tab_open(path, 0, 0, 0);
-	destroy(NULL, dialog);
-}
-
-
-dialog_open_preview(GtkWidget *dialog, GtkWidget *preview_data[])
-{
-	GtkWidget *img = preview_data[0];
-	GtkWidget *label = preview_data[1];
-	//free(preview_data);
-	
-	GtkWidget *parent = gtk_widget_get_parent(img);
-	parent = gtk_widget_get_parent(parent);
-	gtk_frame_set_label(GTK_FRAME(parent), language[56]);   
-    
-	char *path = gtk_file_chooser_get_preview_filename(GTK_FILE_CHOOSER(dialog));
-	if(path==NULL) return;	
-	
-	GdkPixbuf *pix = gdk_pixbuf_new_from_file_at_size(path, 128, 128, NULL);
-	gtk_widget_set_size_request(img, 128, -1);
-	
-	if(pix!=NULL && gdk_pixbuf_get_has_alpha(pix))
-	{
-		int w = gdk_pixbuf_get_width(pix);
-		int h = gdk_pixbuf_get_height(pix);
-		uchar *raw = gdk_pixbuf_get_pixels(pix);
-		uchar *mosaic = object_mosaic_new(w, h, 8);
-		over_object(mosaic, raw, w, h, 0, 0, w, h, 0, 0, w, h, OVER_ADD);
-		over_object(raw, mosaic, w, h, 0, 0, w, h, 0, 0, w, h, OVER_REPLACE);
-	}
-	gtk_image_set_from_pixbuf(GTK_IMAGE(img), pix);
-	if(pix!=NULL) g_object_unref(G_OBJECT(pix));
-	else gtk_image_set_from_stock(GTK_IMAGE(img), "gtk-find", 6);
-		
-	if(pix!=NULL)
-	{
-		int width;
-		int height;
-		gdk_pixbuf_get_file_info(path, &width, &height);
-		char size[15];
-		sprintf(size, "%i x %i", width, height);
-		gtk_label_set_text(GTK_LABEL(label), size);
-	}
-	else gtk_label_set_text(GTK_LABEL(label), "");	
-}
-
-
-dialog_open()
-{
-	GtkWidget *dialog = gtk_file_chooser_dialog_new(NULL,NULL,GTK_FILE_CHOOSER_ACTION_OPEN,NULL);
-	gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
-	
-	if(!strcmp(folder_last,"~/")) folder_last = getenv("HOME");	
-	gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), folder_last);
-	
-	GtkWidget *preview = gtk_frame_new("");
-		GtkWidget *preview_box = gtk_vbox_new(FALSE, 5);
-		gtk_container_set_border_width(GTK_CONTAINER(preview_box), 15);			
-			GtkWidget *preview_img = gtk_image_new();
-			GtkWidget *preview_label = gtk_label_new("");			
-			gtk_box_pack_start(GTK_BOX(preview_box),preview_img,FALSE,FALSE,0);	
-			gtk_box_pack_start(GTK_BOX(preview_box),preview_label,FALSE,FALSE,0);
-			
-			GtkWidget **preview_data = (GtkWidget**)malloc(2*sizeof(GtkWidget*));
-			preview_data[0] = preview_img;
-			preview_data[1] = preview_label;					
-			
-		gtk_container_add(GTK_CONTAINER(preview), preview_box);
-		gtk_widget_show_all(preview);
-		gtk_widget_hide(preview);
-				
-		gtk_file_chooser_set_preview_widget(GTK_FILE_CHOOSER(dialog), preview);
-		gtk_file_chooser_set_use_preview_label(GTK_FILE_CHOOSER(dialog), FALSE);
-		g_signal_connect(G_OBJECT(dialog), "update-preview", G_CALLBACK(dialog_open_preview), preview_data);
-	
-	GtkWidget *extra = gtk_hbox_new(FALSE, 5);
-		GtkWidget *open = gtk_button_new_from_stock("gtk-open");
-		gtk_widget_set_size_request(open, DIALOG_BTN_WIDTH, -1);
-		g_signal_connect(G_OBJECT(open), "clicked", G_CALLBACK(dialog_open_path), dialog);
-		g_signal_connect(G_OBJECT(dialog), "file-activated", G_CALLBACK(dialog_open_path), dialog);
-		
-		GtkWidget *cancel = gtk_button_new_from_stock("gtk-cancel");
-		gtk_widget_set_size_request(cancel, DIALOG_BTN_WIDTH, -1);
-		g_signal_connect(G_OBJECT(cancel), "clicked", G_CALLBACK(destroy), dialog);
-
-		gtk_box_pack_end(GTK_BOX(extra),open,FALSE,FALSE,0);
-		gtk_box_pack_end(GTK_BOX(extra),cancel,FALSE,FALSE,0);		
-	
-	gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER(dialog), extra);		
-	gtk_widget_show_all(dialog);
-}
-
-
-dialog_about()
-{
-	GtkWidget *dialog = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-	gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
-	gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER);
-	gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
-	gtk_window_set_title(GTK_WINDOW(dialog), language[28]);
-	gtk_container_set_border_width(GTK_CONTAINER(dialog), 10);
-
-	GtkWidget *box = gtk_vbox_new(FALSE,5);
-	
-		GtkWidget *notebook = gtk_notebook_new();
-		
-			GtkWidget *splash_box = gtk_vbox_new(FALSE,5);
-		
-				GtkWidget *splash = gtk_image_new_from_file( strcatnew(PATH,"img/about.png") );
-				GtkWidget *copyleft = gtk_label_new("Copyright © 2008 Marcos Diaz Mencia");
-				char version[100];
-				sprintf(version, "%s (%s)", VERSION, SUBVERSION);
-				GtkWidget *version_ = gtk_label_new(version);
-				
-				gtk_box_pack_start(GTK_BOX(splash_box),splash,FALSE,FALSE,0);
-				gtk_box_pack_start(GTK_BOX(splash_box),copyleft,FALSE,FALSE,0);
-				gtk_box_pack_start(GTK_BOX(splash_box),version_,FALSE,FALSE,0);
-				entry_space(splash_box);
-			
-			GtkWidget *credits = gtk_scrolled_window_new(NULL, NULL);	
-				gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(credits), 1, 1);
-					GtkWidget *credits_text = gtk_text_view_new();
-					gtk_text_view_set_left_margin(GTK_TEXT_VIEW(credits_text), 8);
-					gtk_text_view_set_editable(GTK_TEXT_VIEW(credits_text), 0);
-					gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(credits_text), 2);
-					GtkTextBuffer *credits_buffer = gtk_text_buffer_new(NULL);
-					char *credits_file = file_to_str( strcatnew(PATH,"text/credits") );
-					//printf("%i\n", hash_basic(credits_file));
-					if(hash_basic(credits_file) != 1493126064) credits_file = "ERROR";
-					gtk_text_buffer_set_text(credits_buffer, credits_file, -1);
-					gtk_text_view_set_buffer(GTK_TEXT_VIEW(credits_text), credits_buffer);
-				gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(credits), credits_text);
-			
-			GtkWidget *license = gtk_scrolled_window_new(NULL, NULL);	
-				gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(license), 1, 1);
-					GtkWidget *license_text = gtk_text_view_new();
-					gtk_text_view_set_left_margin(GTK_TEXT_VIEW(license_text), 8);
-					gtk_text_view_set_editable(GTK_TEXT_VIEW(license_text), 0);
-					gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(license_text), 2);
-					GtkTextBuffer *license_buffer = gtk_text_buffer_new(NULL);
-					char *license_file = file_to_str( strcatnew(PATH,"text/license") );
-					//printf("%i\n", hash_basic(license_file));
-					if(hash_basic(license_file) != 1035571580) license_file = "ERROR";
-					gtk_text_buffer_set_text(license_buffer, license_file, -1);
-					gtk_text_view_set_buffer(GTK_TEXT_VIEW(license_text), license_buffer);
-				gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(license), license_text);			
-		
-			GtkWidget *buttons = gtk_hbox_new(FALSE,5);
-				GtkWidget *close = gtk_button_new_from_stock("gtk-close");
-				gtk_widget_set_size_request(close, DIALOG_BTN_WIDTH, -1);
-				g_signal_connect(G_OBJECT(close), "clicked", G_CALLBACK(destroy), dialog);			
-				gtk_box_pack_end(GTK_BOX(buttons),close,FALSE,FALSE,0);				
-				
-			gtk_box_pack_start(GTK_BOX(box),notebook,FALSE,FALSE,0);
-			gtk_box_pack_start(GTK_BOX(box),buttons,FALSE,FALSE,0);
-			
-		gtk_notebook_append_page(GTK_NOTEBOOK(notebook), splash_box, gtk_label_new(language[28]));
-		gtk_notebook_append_page(GTK_NOTEBOOK(notebook), credits, gtk_label_new(language[35]));
-		gtk_notebook_append_page(GTK_NOTEBOOK(notebook), license, gtk_label_new(language[36]));
-	
-	gtk_container_add(GTK_CONTAINER(dialog), box);
-	gtk_widget_show_all(dialog);
-}

=== removed file 'lib/gui/entry.c'
--- lib/gui/entry.c	2008-11-26 01:33:49 +0000
+++ lib/gui/entry.c	1970-01-01 00:00:00 +0000
@@ -1,281 +0,0 @@
-/* 
- *  This file is part of Nathive.
- * 
- *  Nathive 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.
- * 
- *  Nathive 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 Nathive.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-
-entry_spin(GtkWidget *parent, char *label, void *value, int min, int max, char *type, 
-           GtkObject *adj, int show_scale)
-{
-	double value_format;
-	if(type=="uchar") value_format = *(uchar*)value;
-	if(type=="int") value_format = *(int*)value;
-	if(type=="double") value_format = *(double*)value;	
-
-	if(adj==NULL) adj = gtk_adjustment_new(0,0,0,1,1,0);
-	if(type=="uchar") g_signal_connect(G_OBJECT(adj),"value-changed",G_CALLBACK(call_adj_uchar),value);
-	if(type=="int") g_signal_connect(G_OBJECT(adj),"value-changed",G_CALLBACK(call_adj_int),value);
-	if(type=="double") g_signal_connect(G_OBJECT(adj),"value-changed",G_CALLBACK(call_adj_double),value);
-
-	int separation = 0;
-	if(!show_scale) separation = 10;
-	GtkWidget *box = gtk_hbox_new(FALSE, separation);	
-	
-		GtkWidget *label_ = gtk_label_new(label);
-		gtk_misc_set_alignment(GTK_MISC(label_), 0, 0.5);	
-		gtk_box_pack_start(GTK_BOX(box),label_,TRUE,TRUE,0);
-	
-		if(show_scale)
-		{
-			GtkWidget *scale = gtk_scale_button_new(1,1,1,4,NULL);
-			gtk_scale_button_set_adjustment(GTK_SCALE_BUTTON(scale), GTK_ADJUSTMENT(adj));
-			const gchar *scaleIcons[] = {"gtk-index", NULL};
-			gtk_scale_button_set_icons(GTK_SCALE_BUTTON(scale), scaleIcons);
-			gtk_box_pack_start(GTK_BOX(box),scale,FALSE,FALSE,0);				
-		}
-	
-		GtkWidget *spin = gtk_spin_button_new(GTK_ADJUSTMENT(adj), 1, 0);
-		gtk_spin_button_set_range(GTK_SPIN_BUTTON(spin), min, max);
-		if(type=="double") 
-		{
-			gtk_spin_button_set_digits(GTK_SPIN_BUTTON(spin), 2);
-			gtk_spin_button_set_increments(GTK_SPIN_BUTTON(spin), 0.01, 0.01);
-			gtk_spin_button_set_range(GTK_SPIN_BUTTON(spin), 0.01, max);
-		}
-		gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin), value_format);
-		gtk_box_pack_start(GTK_BOX(box),spin,FALSE,FALSE,0);			
-		
-	gtk_box_pack_start(GTK_BOX(parent), box, FALSE,FALSE,0);
-}
-
-
-entry_spinmenu(GtkWidget *parent, char *label, void *value, int min, int max, char *type, 
-			   GtkObject *adj, int menun, int *menuvalue, char *ops[], GtkWidget *menu)
-{
-	double value_format;
-	if(type=="int") value_format = *(int*)value;
-	if(type=="double") value_format = *(double*)value;	
-
-	if(adj==NULL) adj = gtk_adjustment_new(0,0,0,1,1,0);
-	if(type=="int") g_signal_connect(G_OBJECT(adj),"value-changed",G_CALLBACK(call_adj_int),value);
-	if(type=="double") g_signal_connect(G_OBJECT(adj),"value-changed",G_CALLBACK(call_adj_double),value);
-
-	GtkWidget *box = gtk_hbox_new(FALSE, 0);	
-	
-		GtkWidget *label_ = gtk_label_new(label);
-		gtk_misc_set_alignment(GTK_MISC(label_), 0, 0.5);		
-	
-	
-		GtkWidget *spin = gtk_spin_button_new(GTK_ADJUSTMENT(adj), 1, 0);
-		gtk_spin_button_set_range(GTK_SPIN_BUTTON(spin), min, max);
-		if(type=="double") 
-		{
-			gtk_spin_button_set_digits(GTK_SPIN_BUTTON(spin), 2);
-			gtk_spin_button_set_increments(GTK_SPIN_BUTTON(spin), 0.01, 0.01);
-			gtk_spin_button_set_range(GTK_SPIN_BUTTON(spin), 0.01, max);
-		}
-		gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin), value_format);
-		
-	
-		GtkWidget *btn = gtk_button_new();
-		gtk_button_set_image(GTK_BUTTON(btn), gtk_image_new_from_stock("gtk-sort-descending", 1));
-		gtk_button_set_relief(GTK_BUTTON(btn), GTK_RELIEF_NONE);
-		
-		int i;
-		int *ids = (int*)malloc(menun*sizeof(int));
-		for(i=0; i<menun; i++) ids[i] = i;
-		
-		if(menu==NULL) menu = gtk_menu_new();
-		if(ops)
-		{
-			GtkWidget *item[menun];
-			for(i=0; i<menun; i++)
-			{
-				int **data = (int**)malloc(2*sizeof(int*));
-				data[0] = menuvalue;
-				data[1] = &ids[i];
-		
-				item[i] = gtk_menu_item_new_with_label(ops[i]);
-				gtk_menu_shell_append(GTK_MENU_SHELL(menu), item[i]);
-				g_signal_connect_swapped(G_OBJECT(item[i]),"activate",G_CALLBACK(call_spinmenu), data);	
-			}			
-		}
-		gtk_widget_show_all(menu);
-		g_signal_connect(G_OBJECT(btn),"clicked",G_CALLBACK(call_menu), menu);	
-			
-		
-		gtk_box_pack_start(GTK_BOX(box),label_,TRUE,TRUE,0);
-		gtk_box_pack_start(GTK_BOX(box),btn,FALSE,FALSE,0);	
-		gtk_box_pack_start(GTK_BOX(box),spin,FALSE,FALSE,0);
-		
-	gtk_box_pack_start(GTK_BOX(parent), box, FALSE,FALSE,0);
-}
-
-
-entry_combo(GtkWidget *parent, char *label, int n, int *value, char *ops[], GtkWidget *combo)
-{
-	GtkWidget *box = gtk_hbox_new(FALSE,5);	
-	
-		GtkWidget *label_ = gtk_label_new(label);
-		gtk_misc_set_alignment(GTK_MISC(label_), 0, 0.5);
-		
-		if(combo==NULL) combo = gtk_combo_box_new_text();
-		
-		int i;
-		for(i=0; i<n; i++) gtk_combo_box_append_text(GTK_COMBO_BOX(combo), ops[i]);
-
-		gtk_combo_box_set_active(GTK_COMBO_BOX(combo), *value);
-		g_signal_connect(G_OBJECT(combo),"changed",G_CALLBACK(call_combo),value);
-	
-		if(label!="") gtk_box_pack_start(GTK_BOX(box), label_, TRUE, TRUE, 0);
-		
-		if(label!="") gtk_box_pack_start(GTK_BOX(box), combo, FALSE, FALSE, 0);
-		else gtk_box_pack_end(GTK_BOX(box), combo, FALSE, FALSE, 0);		
-		
-	gtk_box_pack_start(GTK_BOX(parent), box, FALSE,FALSE,0);
-}
-
-
-entry_toggle(GtkWidget *parent, char *label, int n, int *value, char *ops[], 
-             GtkWidget *but[], char *call)
-{
-	GtkWidget *box = gtk_hbox_new(FALSE,0);	
-	
-		GtkWidget *label_ = gtk_label_new(label);
-		gtk_misc_set_alignment(GTK_MISC(label_), 0, 0.5);	
-		gtk_box_pack_start(GTK_BOX(box),label_,TRUE,TRUE,0);
-		
-		int i;		
-		GtkWidget *btn_pre = NULL;
-		for(i=0; i<n; i++)
-		{		
-			if(!btn_pre) but[i] = gtk_radio_button_new(NULL);
-			else but[i] = gtk_radio_button_new_from_widget(GTK_RADIO_BUTTON(btn_pre));
-			btn_pre = but[i];
-		}
-		
-		int *ids = (int*)malloc(n*sizeof(int));;
-		for(i=0; i<n; i++)
-		{
-			ids[i] = i;
-		}
-		
-		for(i=0; i<n; i++)
-		{
-			gtk_button_set_relief(GTK_BUTTON(but[i]), GTK_RELIEF_NONE);
-			gtk_button_set_image(GTK_BUTTON(but[i]), gtk_image_new_from_file(ops[i]));
-			gtk_toggle_button_set_mode(GTK_TOGGLE_BUTTON(but[i]), 0);
-			if(*value==i) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(but[i]), 1);
-			
-			int **data = (int**)malloc(2*sizeof(int*));
-			data[0] = value;
-			data[1] = &ids[i];
-			
-			g_signal_connect(G_OBJECT(but[i]),"pressed",G_CALLBACK(call_radio), data);
-			g_signal_connect(G_OBJECT(but[i]),"pressed",G_CALLBACK(call_function), call);
-			
-			gtk_box_pack_start(GTK_BOX(box),but[i],FALSE,FALSE,0);
-		}	
-		
-	gtk_box_pack_start(GTK_BOX(parent), box, FALSE,FALSE,0);
-}
-
-
-entry_check(GtkWidget *parent, char *label, int *value, GtkWidget *check, char *call)
-{
-	GtkWidget *box = gtk_hbox_new(FALSE,0);	
-	
-		GtkWidget *label_ = gtk_label_new(label);
-		gtk_misc_set_alignment(GTK_MISC(label_), 0, 0.5);	
-		
-		if(check==NULL) check = gtk_check_button_new();
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check), *value);
-	
-		gtk_box_pack_start(GTK_BOX(box),label_,TRUE,TRUE,0);
-		gtk_box_pack_start(GTK_BOX(box),check,FALSE,FALSE,0);	
-		
-		g_signal_connect(G_OBJECT(check),"toggled",G_CALLBACK(call_check), value);		
-		
-	gtk_box_pack_start(GTK_BOX(parent), box, FALSE,FALSE,0);
-}
-
-
-entry_entry(GtkWidget *parent, char *label, char *value, int len, char *call, GtkWidget *entry)
-{
-	GtkWidget *box = gtk_hbox_new(FALSE,0);	
-	
-		GtkWidget *label_ = gtk_label_new(label);
-		gtk_misc_set_alignment(GTK_MISC(label_), 0, 0.5);	
-				
-		if(entry==NULL) entry = gtk_entry_new();
-		gtk_entry_set_max_length(GTK_ENTRY(entry), len);
-		gtk_entry_set_width_chars(GTK_ENTRY(entry), len+1);
-		gtk_entry_set_text(GTK_ENTRY(entry), value);
-	
-		gtk_box_pack_start(GTK_BOX(box),label_,TRUE,TRUE,0);
-		gtk_box_pack_start(GTK_BOX(box),entry,FALSE,FALSE,0);	
-		
-		g_signal_connect(G_OBJECT(entry),"changed",G_CALLBACK(call_function), call);		
-		
-	gtk_box_pack_start(GTK_BOX(parent), box, FALSE,FALSE,0);
-}
-
-
-entry_color(GtkWidget *parent, char *label)
-{
-	GtkWidget *box = gtk_hbox_new(FALSE,0);	
-	
-		GtkWidget *label_ = gtk_label_new(label);
-		gtk_misc_set_alignment(GTK_MISC(label_), 0, 0.5);	
-				
-		GtkWidget *color = gtk_color_button_new();
-	
-		gtk_box_pack_start(GTK_BOX(box),label_,TRUE,TRUE,0);
-		gtk_box_pack_start(GTK_BOX(box),color,FALSE,FALSE,0);	
-		
-	gtk_box_pack_start(GTK_BOX(parent), box, FALSE,FALSE,0);
-}
-
-
-entry_clear(GtkWidget *parent, char *call, int size)
-{
-	GtkWidget *button = gtk_button_new();
-	gtk_button_set_image(GTK_BUTTON(button), gtk_image_new_from_stock("gtk-clear", size));
-	gtk_widget_set_tooltip_text(button, language[23]);
-	g_signal_connect(G_OBJECT(button),"clicked",G_CALLBACK(call_function), call);
-	gtk_box_pack_end(GTK_BOX(parent),button,FALSE,FALSE,0);			
-}
-
-
-entry_separator(GtkWidget *parent)
-{
-	GtkWidget *separator = gtk_hseparator_new();
-	gtk_box_pack_start(GTK_BOX(parent), separator, FALSE, FALSE, 4);
-}
-
-
-entry_space(GtkWidget *parent)
-{
-	GtkWidget *box = gtk_vbox_new(FALSE, 0);
-	gtk_widget_set_size_request(box, -1, 8);
-	gtk_box_pack_start(GTK_BOX(parent), box, FALSE, FALSE, 0);
-}
-
-
-entry_expand(GtkWidget *parent)
-{
-	GtkWidget *box = gtk_hbox_new(FALSE,0);
-	gtk_box_pack_start(GTK_BOX(parent), box, TRUE,TRUE,0);
-}

=== removed file 'lib/gui/event.c'
--- lib/gui/event.c	2008-11-26 01:33:49 +0000
+++ lib/gui/event.c	1970-01-01 00:00:00 +0000
@@ -1,61 +0,0 @@
-/* 
- *  This file is part of Nathive.
- * 
- *  Nathive 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.
- * 
- *  Nathive 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 Nathive.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-
-event_press(GtkWidget *wid, GdkEventButton *event)
-{
-	int x = (int)event->x;
-	int y = (int)event->y;
-	user_button = event->button;
-	user_x = x;
-	user_y = y;
-	user_x_root = (int)event->x_root;
-	user_y_root = (int)event->y_root;
-	user_x_press = offset_x(x);
-	user_y_press = offset_y(y);
-	if(user_button==2) cursor_stock(GDK_FLEUR);
-	if(tool==2) if(user_button==1) picker_get(x,y);
-	if(tool==3) if(user_button==1) brush_spacer(x,y,1);
-}
-
-event_release(GtkWidget *wid)
-{
-	if(tool==0) if(user_button==1) object_merge();
-	cursor_default();
-	user_button = 0;	
-}
-
-event_motion(GtkWidget *wid, GdkEventMotion *event)
-{
-	int x = (int)event->x;
-	int y = (int)event->y;
-	int x_root = (int)event->x_root;
-	int y_root = (int)event->y_root;
-	
-	if(user_button==2) scroll(x_root, y_root);
-	
-	if(tool==0) if(user_button==1) select_move(x,y);
-	if(tool==2) if(user_button==1) picker_get(x,y);
-	if(tool==3) 
-	{
-		if(user_button==1) brush_spacer(x,y,0);
-		if(user_button==3) brush_size_motion(x,y);
-	}
-	statusbar_x = offset_x(x);
-	statusbar_y = offset_y(y);	
-	statusbar_refresh();
-}

=== removed file 'lib/gui/menu.c'
--- lib/gui/menu.c	2008-11-26 01:33:49 +0000
+++ lib/gui/menu.c	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-/* 
- *  This file is part of Nathive.
- * 
- *  Nathive 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.
- * 
- *  Nathive 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 Nathive.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-
-menubar_item_new(GtkWidget *parent, char *label, char *stock, char *call)
-{
-	GtkWidget *item = gtk_image_menu_item_new_with_label(label);
-	gtk_menu_shell_append(GTK_MENU_SHELL(parent), item);
-	if(call) g_signal_connect(G_OBJECT(item), "activate", G_CALLBACK(call_function), call);
-	if(stock)
-	{
-		GtkWidget *image = gtk_image_new_from_stock(stock, 1);
-		gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image);
-	}
-}

=== removed file 'lib/gui/misc.c'
--- lib/gui/misc.c	2008-11-26 18:12:53 +0000
+++ lib/gui/misc.c	1970-01-01 00:00:00 +0000
@@ -1,69 +0,0 @@
-/* 
- *  This file is part of Nathive.
- * 
- *  Nathive 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.
- * 
- *  Nathive 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 Nathive.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-
-gtk_quit()
-{
-	printf(">> thanks for being libre, see you soon\n\n");
-    gtk_main_quit();
-}
-
-
-destroy(GtkWidget *widget, GtkWidget *destroy_me)
-{
-	gtk_widget_destroy(destroy_me);
-}
-
-
-window_fullscreen()
-{
-	if(!fullscreen)
-	{
-		gtk_window_fullscreen(GTK_WINDOW(win));
-		fullscreen = 1;
-	}
-	else
-	{
-		gtk_window_unfullscreen(GTK_WINDOW(win));
-		fullscreen = 0;
-	}
-}
-
-
-sidebar_hide()
-{
-	int sidebar_display;
-	gtk_object_get(GTK_OBJECT(sidebar), "visible", &sidebar_display, NULL);
-	if(sidebar_display) gtk_widget_hide(sidebar);
-	else gtk_widget_show(sidebar);
-}
-
-
-sidebar_tool_change(GtkWidget *wid, void *data)
-{
-	int i;
-	for(i=0; i<TOOLS; i++) gtk_widget_hide(sidebar_tools[i]);
-	gtk_widget_show(sidebar_tools[tool]);
-
-	GtkWidget *new_label;
-	if(tool==0) new_label = gtk_image_new_from_file( strcatnew(PATH,"img/select.png") );
-	if(tool==1) new_label = gtk_image_new_from_file( strcatnew(PATH,"img/mask.png") );
-	if(tool==2) new_label = gtk_image_new_from_file( strcatnew(PATH,"img/picker.png") );
-	if(tool==3) new_label = gtk_image_new_from_file( strcatnew(PATH,"img/brush.png") );
-	gtk_notebook_set_tab_label(GTK_NOTEBOOK(sidebar), sidebar_tool, new_label);
-
-}

=== removed file 'lib/gui/object.c'
--- lib/gui/object.c	2008-12-01 07:53:03 +0000
+++ lib/gui/object.c	1970-01-01 00:00:00 +0000
@@ -1,210 +0,0 @@
-/* 
- *  This file is part of Nathive.
- * 
- *  Nathive 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.
- * 
- *  Nathive 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 Nathive.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-
-object_gui_new(char *label, GtkListStore *store)
-{
-	if(store==NULL) store = dom_objgui_store(dom_tab());
-	GtkTreeIter iter;
-	gtk_list_store_append(store, &iter);
-	gtk_list_store_set(store, &iter, 0, label, -1);
-	gtk_list_store_move_after(store, &iter, NULL);
-	
-	GtkTreeSelection *select = gtk_tree_view_get_selection(GTK_TREE_VIEW(object_tree_view));
-	int dom_obj_sel_temp = *dom_obj_sel(-1);
-	gtk_tree_selection_select_iter(select, &iter);
-	*dom_obj_sel(-1) = dom_obj_sel_temp;
-}
-
-
-object_gui_select_gtd(GtkTreeSelection *selection, void *data)
-{
-	GList *list = gtk_tree_selection_get_selected_rows(selection, NULL);
-	GtkTreePath *path = g_list_nth_data(list, 0);
-	if(path==NULL) return;
-	int *index = gtk_tree_path_get_indices(path);
-	*dom_obj_sel(-1) = dom_obj_count(-1) - index[0];
-}
-
-
-object_gui_select_dtg(int tab)
-{
-	GtkTreeSelection *select = gtk_tree_view_get_selection(GTK_TREE_VIEW(object_tree_view));
-	GtkTreeIter iter;
-	GtkTreeModel *model = dom_objgui_model(tab);
-	gtk_tree_model_get_iter_first(model, &iter);
-	int objs = dom_obj_count(tab);
-	int sel = *dom_obj_sel(tab);
-	int i;
-	for(i=0; i<objs-sel; i++) gtk_tree_model_iter_next(model, &iter);
-	int dom_obj_sel_temp = *dom_obj_sel(-1);
-	gtk_tree_selection_select_iter(select, &iter);
-	*dom_obj_sel(-1) = dom_obj_sel_temp;
-}
-
-
-object_new()
-{
-	if(n_tree_count( dom, n_tree_stalk(0) ) == 0) return;
-
-	printf(">> creating object in '%s'\n", (char*)dom_file_path());
-	if(dom_tab()==-1) return;
-	lint obj_size = (*dom_w()) * (*dom_h()) * 4;
-	uchar *obj_raw = (uchar*)malloc(obj_size*sizeof(uchar));
-	
-	lint i;
-	for(i=0; i<obj_size; i++) obj_raw[i] = 0;
-	
-	NTree *obj = n_tree_new();
-	n_tree_add(dom, n_tree_stalk(2,dom_tab(),DOM_OBJ), obj, TRUE);
-	
-		int *w = (int*)malloc(sizeof(int));
-		int *h = (int*)malloc(sizeof(int));
-		*w = *dom_w();
-		*h = *dom_h();
-		int *x = (int*)malloc(sizeof(int));
-		int *y = (int*)malloc(sizeof(int));	
-		*x = 0;
-		*y = 0;					
-		
-		n_tree_add(obj, n_tree_stalk(0), obj_raw, FALSE);
-		n_tree_add(obj, n_tree_stalk(0), w, FALSE);	
-		n_tree_add(obj, n_tree_stalk(0), h, FALSE);
-		n_tree_add(obj, n_tree_stalk(0), x, FALSE);	
-		n_tree_add(obj, n_tree_stalk(0), y, FALSE);
-		
-	object_gui_new(language[2], NULL);
-	*dom_obj_sel(-1) = dom_obj_count(-1);
-}
-
-
-object_merge_area(int x, int y, int w, int h)
-{
-	int xo = offset_x(x);
-	int yo = offset_y(y);
-	
-	over_object(
-		dom_raw(), 
-		dom_mosaic(),  
-		*dom_w(), 
-		*dom_h(),  
-		0, 
-		0, 
-		*dom_w(),
-		*dom_h(), 
-		xo, 
-		yo, 
-		w, 
-		h,  
-		OVER_REPLACE
-	);
-	
-	int objs = dom_obj_count(-1);
-	int i;
-	for(i=1; i<objs+1; i++)
-	{
-		over_object(
-			dom_raw(), 
-			dom_obj_raw(i), 
-			*dom_w(), 
-			*dom_h(), 
-			*dom_obj_x(i), 
-			*dom_obj_y(i), 
-			*dom_obj_w(i), 
-			*dom_obj_h(i), 
-			xo,
-			yo,
-			w,
-			h,
-			OVER_ADD
-		);
-	}
-	
-	gtk_widget_queue_draw_area(dom_img(), x, y, w, h);
-}
-
-
-object_merge_area_step(int x, int y, int w, int h)
-{
-	int step = 100;
-	
-	int user_area[4]; 
-	scroll_area(user_area); 
-	
-	int xx, yy;
-	for(yy=y; yy<y+h; yy+=step)
-	{
-		for(xx=x; xx<x+w; xx+=step)
-		{
-			if(xx < user_area[0] - step || xx > user_area[0] + user_area[2]) continue;
-			if(yy < user_area[1] - step || yy > user_area[1] + user_area[3]) continue;
-		
-			if(gdk_events_pending()) return;
-			object_merge_area(xx, yy, step, step);
-			gtk_main_iteration_do(0);
-		}
-	}
-}
-
-
-object_merge()
-{
-	object_merge_area(-offset_x(0), -offset_y(0), *dom_w(), *dom_h());
-}
-
-object_merge_step()
-{
-	object_merge_area_step(-offset_x(0), -offset_y(0), *dom_w(), *dom_h());
-}
-
-
-uchar *object_mosaic_new(int w, int h, int size)
-{
-	uchar grayA = 203;
-	uchar grayB = 127;	
-	
-	uchar *mosaic = (uchar*)malloc(w*h*4*sizeof(uchar));
-	int x,y,xx,yy;
-	xx = yy = 0;
-	for(y=0; y<h; y++)
-	{
-		xx = 0;
-		for(x=0; x<w; x++)
-		{
-			int pos = pixel_pos(x,y,w);
-			if( (xx<size/2 && yy<size/2) || (xx>=size/2 && yy>=size/2))	
-			{
-				mosaic[pos+0] = grayA;
-				mosaic[pos+1] = grayA;
-				mosaic[pos+2] = grayA;
-			}
-			else
-			{
-				mosaic[pos+0] = grayB;
-				mosaic[pos+1] = grayB;
-				mosaic[pos+2] = grayB;				
-			}
-			mosaic[pos+3] = 255;
-		
-			xx++;
-			if(xx>=size) xx = 0; 
-		}
-		yy++;
-		if(yy>=size) yy = 0; 
-	}
-	return mosaic;
-}

=== removed file 'lib/gui/other.c'
--- lib/gui/other.c	2008-11-28 22:03:52 +0000
+++ lib/gui/other.c	1970-01-01 00:00:00 +0000
@@ -1,67 +0,0 @@
-/* 
- *  This file is part of Nathive.
- * 
- *  Nathive 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.
- * 
- *  Nathive 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 Nathive.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-
-toolbar_item(GtkWidget *toolbar, int n, char *ops[])
-{
-	int nz;		
-	GtkWidget *but[n];
-	GtkWidget *butPre = NULL;
-	for(nz=0; nz<n; nz++)
-	{		
-		if(!butPre) but[nz] = gtk_radio_button_new(NULL);
-		else but[nz] = gtk_radio_button_new_from_widget(GTK_RADIO_BUTTON(butPre));
-		butPre = but[nz];
-	}
-	
-	int *ids = (int*)malloc(n*sizeof(int));;
-	for(nz=0; nz<n; nz++)
-	{
-		ids[nz] = nz;
-	}
-	
-	for(nz=0; nz<n; nz++)
-	{
-		gtk_button_set_relief(GTK_BUTTON(but[nz]), GTK_RELIEF_NONE);
-		gtk_button_set_image(GTK_BUTTON(but[nz]), gtk_image_new_from_file(ops[nz]));
-		gtk_toggle_button_set_mode(GTK_TOGGLE_BUTTON(but[nz]), 0);
-		if(tool==nz) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(but[nz]), 1);
-		
-		int **data = (int**)malloc(2*sizeof(int*));
-		data[0] = &tool;
-		data[1] = &ids[nz];
-		
-		g_signal_connect(G_OBJECT(but[nz]),"pressed",G_CALLBACK(call_radio), data);
-		g_signal_connect(G_OBJECT(but[nz]),"pressed",G_CALLBACK(sidebar_tool_change), NULL);
-		
-		gtk_box_pack_start(GTK_BOX(toolbar),but[nz],FALSE,FALSE,0);
-	}	
-}
-
-
-save()
-{
-	if(gtk_notebook_get_n_pages(GTK_NOTEBOOK(tabs)))
-	{		
-		int tab = gtk_notebook_get_current_page(GTK_NOTEBOOK(tabs));
-		char *path = n_tree_get(dom, n_tree_stalk(2,tab,0));
-		printf(">> saving %s\n",path);
-		
-		GdkPixbuf *pix = n_tree_get(dom, n_tree_stalk(2,tab,4));
-		gdk_pixbuf_save (pix, strcatnew(PATH,"output.png"), "png", NULL, NULL);
-	}
-}

=== removed file 'lib/gui/scroll.c'
--- lib/gui/scroll.c	2008-11-26 01:33:49 +0000
+++ lib/gui/scroll.c	1970-01-01 00:00:00 +0000
@@ -1,55 +0,0 @@
-/* 
- *  This file is part of Nathive.
- * 
- *  Nathive 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.
- * 
- *  Nathive 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 Nathive.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-
-scroll(int x, int y)
-{
-	int x_rel = user_x_root - x;
-	int y_rel = user_y_root - y;	
-	GtkScrolledWindow *scroll = GTK_SCROLLED_WINDOW(dom_scroll());
-	
-	int h = gtk_adjustment_get_value(gtk_scrolled_window_get_hadjustment(scroll)) + x_rel;
-	int v = gtk_adjustment_get_value(gtk_scrolled_window_get_vadjustment(scroll)) + y_rel;
-	int alloc_x = gtk_scrolled_window_get_hscrollbar(scroll)->allocation.width;
-	int alloc_y = gtk_scrolled_window_get_vscrollbar(scroll)->allocation.height;
-	h = max(h, 0);
-	v = max(v, 0);
-	h = min(h, *dom_w() - alloc_x + 4);
-	v = min(v, *dom_h() - alloc_y + 4);
-	
-	if(GTK_WIDGET(scroll)->allocation.width - alloc_x < 100)
-	{
-		gtk_adjustment_set_value(gtk_scrolled_window_get_hadjustment(scroll), h);
-	}
-
-	if(GTK_WIDGET(scroll)->allocation.height - alloc_y < 100)
-	{
-		gtk_adjustment_set_value(gtk_scrolled_window_get_vadjustment(scroll), v);
-	}		
-	
-	user_x_root -= x_rel;
-	user_y_root -= y_rel;
-}
-
-scroll_area(int arr[4])
-{
-	GtkScrolledWindow *scroll = GTK_SCROLLED_WINDOW(dom_scroll());
-	arr[0] = gtk_adjustment_get_value(gtk_scrolled_window_get_hadjustment(scroll));
-	arr[1] = gtk_adjustment_get_value(gtk_scrolled_window_get_vadjustment(scroll));
-	arr[2] = GTK_WIDGET(scroll)->allocation.width;
-	arr[3] = GTK_WIDGET(scroll)->allocation.height;
-}

=== removed file 'lib/gui/statusbar.c'
--- lib/gui/statusbar.c	2008-11-28 22:03:52 +0000
+++ lib/gui/statusbar.c	1970-01-01 00:00:00 +0000
@@ -1,66 +0,0 @@
-/* 
- *  This file is part of Nathive.
- * 
- *  Nathive 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.
- * 
- *  Nathive 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 Nathive.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-
-statusbar_refresh()
-{
-	statusbar_w = *dom_w();
-	statusbar_h = *dom_h();
-	
-	char statusbar_text[100];
-	sprintf(
-		statusbar_text,
-		" %i x %i %s  ·  %i%c",
-		statusbar_w, statusbar_h, language[40],
-		statusbar_z*100, 37
-	);
-
-	if(statusbar_msg==0) // default
-	{
-		sprintf(
-			statusbar_text, 
-			"%s  ·  x%i  y%i", 
-			statusbar_text, 
-			statusbar_x, statusbar_y
-		);
-	}
-
-	if(statusbar_msg==1) // brush size 3rd button
-	{
-		sprintf(
-			statusbar_text, 
-			"%s  ·  x%i  y%i  ·  %s: %i", 
-			statusbar_text, 
-			statusbar_x, statusbar_y,
-			language[52], brush_size
-		);
-	}
-	
-	if(statusbar_msg==2) // select move
-	{
-		sprintf(
-			statusbar_text,
-			"%s  ·  x%i:%i (%i)  y%i:%i (%i)",
-			statusbar_text, 
-			user_x_press, statusbar_x, statusbar_x-user_x_press,
-			user_y_press, statusbar_y, statusbar_y-user_y_press		
-		);
-	}
-	
-	statusbar_msg = 0;		
-	gtk_statusbar_push(GTK_STATUSBAR(statusbar), 0, statusbar_text);
-}

=== removed file 'lib/gui/tab.c'
--- lib/gui/tab.c	2008-12-01 07:53:03 +0000
+++ lib/gui/tab.c	1970-01-01 00:00:00 +0000
@@ -1,193 +0,0 @@
-/* 
- *  This file is part of Nathive.
- * 
- *  Nathive 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.