commit dcdaad92cf9c9e277f40b255b681ec5f2069ad12
Author: Luis Ángel San Martín
Date: Sat Jul 14 09:56:50 2012 +0200
cambiado casting de void * a uint por qint64 (se evita el error ce compilaci?n
al compilar en 64 bit)
diff --git a/COPYING.txt b/COPYING.txt
new file mode 100644
index 00000000..94a9ed02
--- /dev/null
+++ b/COPYING.txt
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc.
+ 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.
+
+
+ Copyright (C)
+
+ 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 .
+
+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:
+
+ Copyright (C)
+ 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
+.
+
+ 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
+.
diff --git a/README.txt b/README.txt
new file mode 100644
index 00000000..f2e8f777
--- /dev/null
+++ b/README.txt
@@ -0,0 +1,4 @@
+This software was developed by Luis ngel San Martn Rodrguez (luisangelsm@gmail.com) under GPL v3 license (for more details read COPYING.txt).
+
+Project home page : http://code.google.com/p/yacreader/
+
diff --git a/YACReader/YACReader.pro b/YACReader/YACReader.pro
new file mode 100644
index 00000000..6c155e26
--- /dev/null
+++ b/YACReader/YACReader.pro
@@ -0,0 +1,57 @@
+# #####################################################################
+# Automatically generated by qmake (2.01a) mi 8. oct 20:54:05 2008
+# #####################################################################
+TEMPLATE = app
+TARGET =
+DEPENDPATH += . \
+ release
+INCLUDEPATH += .
+INCLUDEPATH += ../common
+QT += network webkit phonon
+CONFIG += release
+CONFIG -= flat
+
+# Input
+HEADERS += comic.h \
+ configuration.h \
+ goto_dialog.h \
+ magnifying_glass.h \
+ main_window_viewer.h \
+ viewer.h \
+ ../common/pictureflow.h \
+ ../common/custom_widgets.h \
+ ../common/check_new_version.h \
+ ../common/qnaturalsorting.h \
+ goto_flow.h \
+ options_dialog.h \
+ bookmarks.h \
+ bookmarks_dialog.h \
+ render.h \
+ shortcuts_dialog.h \
+ translator.h
+SOURCES += comic.cpp \
+ configuration.cpp \
+ goto_dialog.cpp \
+ magnifying_glass.cpp \
+ main.cpp \
+ main_window_viewer.cpp \
+ viewer.cpp \
+ ../common/pictureflow.cpp \
+ ../common/custom_widgets.cpp \
+ ../common/check_new_version.cpp \
+ ../common/qnaturalsorting.cpp \
+ goto_flow.cpp \
+ options_dialog.cpp \
+ bookmarks.cpp \
+ bookmarks_dialog.cpp \
+ render.cpp \
+ shortcuts_dialog.cpp \
+ translator.cpp
+RESOURCES += images.qrc \
+ files.qrc
+RC_FILE = icon.rc
+TRANSLATIONS = yacreader_es.ts \ yacreader_fr.ts
+FORMS +=
+
+Release:DESTDIR = ../release
+Debug:DESTDIR = ../debug
\ No newline at end of file
diff --git a/YACReader/bookmarks.cpp b/YACReader/bookmarks.cpp
new file mode 100644
index 00000000..2e5978ec
--- /dev/null
+++ b/YACReader/bookmarks.cpp
@@ -0,0 +1,159 @@
+#include "bookmarks.h"
+#include
+#include
+#include
+#include
+
+#include
+
+#define NUM_BOOKMARKS 250
+
+Bookmarks::Bookmarks()
+:lastPageIndex(0)
+{
+ list.load();
+}
+void Bookmarks::setLastPage(int index,const QPixmap & page)
+{
+ lastPageIndex = index;
+ lastPage = page;
+}
+void Bookmarks::setBookmark(int index,const QPixmap & page)
+{
+ if(!bookmarks.contains(index))
+ {
+ bookmarks.insert(index,page);
+ latestBookmarks.push_front(index);
+ if(latestBookmarks.count()>3)
+ {
+ bookmarks.remove(latestBookmarks.back());
+ latestBookmarks.pop_back();
+ }
+ }
+ else //udate de pixmap;
+ {
+ bookmarks[index]=page;
+ }
+}
+
+void Bookmarks::removeBookmark(int index)
+{
+ bookmarks.remove(index);
+}
+
+QList Bookmarks::getBookmarkPages() const
+{
+ return bookmarks.keys();
+}
+
+QPixmap Bookmarks::getBookmarkPixmap(int page) const
+{
+ return bookmarks.value(page);
+}
+
+QPixmap Bookmarks::getLastPagePixmap() const
+{
+ return lastPage;
+}
+
+int Bookmarks::getLastPage() const
+{
+ return lastPageIndex;
+}
+
+
+bool Bookmarks::isBookmark(int page)
+{
+ return bookmarks.contains(page);
+}
+
+bool Bookmarks::imageLoaded(int page)
+{
+ return !bookmarks.value(page).isNull();
+}
+
+void Bookmarks::newComic(const QString & path)
+{
+ QFileInfo f(path);
+ QString comicID = f.fileName().toLower()+QString::number(f.size());
+ clear();
+ BookmarksList::Bookmark b = list.get(comicID);
+ comicPath=comicID;
+ lastPageIndex = b.lastPage;
+ latestBookmarks = b.bookmarks;
+ for(int i=0;i> list;
+ f.close();
+ }
+}
+
+void BookmarksList::save()
+{
+ QFile f(QCoreApplication::applicationDirPath()+"/bookmarks.yacr");
+ f.open(QIODevice::WriteOnly);
+ QDataStream dataS(&f);
+ if(list.count()>NUM_BOOKMARKS)
+ deleteOldest(list.count()-NUM_BOOKMARKS);
+ dataS << list;
+ f.close();
+}
+
+
+void BookmarksList::deleteOldest(int num)
+{
+ QString comic;
+ QDateTime date(QDate(10000,1,1));//TODO MAX_DATE??
+ for(QMap::const_iterator itr=list.begin();itr!=list.end();itr++)
+ {
+ if(itr->addedadded;
+ }
+ }
+ list.remove(comic);
+}
+
+void BookmarksList::add(const QString & comicID, const Bookmark & b)
+{
+ list.insert(comicID,b);
+}
+
+BookmarksList::Bookmark BookmarksList::get(const QString & comicID)
+{
+ //if(list.contains(comicID)
+ return list.value(comicID);
+}
\ No newline at end of file
diff --git a/YACReader/bookmarks.h b/YACReader/bookmarks.h
new file mode 100644
index 00000000..adb0b835
--- /dev/null
+++ b/YACReader/bookmarks.h
@@ -0,0 +1,77 @@
+#ifndef BOOKMARKS_H
+#define BOOKMARKS_H
+
+#include
+#include
+#include
+#include
+#include
+#include
+class BookmarksList
+{
+public:
+ struct Bookmark {
+ int lastPage;
+ QList bookmarks;
+ QDateTime added;
+ Bookmark():lastPage(0){};
+ friend QDataStream & operator<< ( QDataStream & out, const Bookmark & bm )
+ {
+ out << bm.lastPage;
+ out << bm.bookmarks;
+ out << bm.added;
+ return out;
+ }
+ friend QDataStream & operator>> ( QDataStream & in, Bookmark & bm )
+ {
+ in >> bm.lastPage;
+ in >> bm.bookmarks;
+ in >> bm.added;
+ return in;
+ }
+
+ };
+ BookmarksList(){}
+ void load();
+ void save();
+ void add(const QString & comicID, const Bookmark & b);
+ Bookmark get(const QString & comicID);
+protected:
+ QMap list;
+ void deleteOldest(int num);
+
+};
+
+class Bookmarks : public QObject
+{
+ Q_OBJECT
+
+ protected:
+ QString comicPath;
+ //bookmarks setted by the user
+ QMap bookmarks;
+ QList latestBookmarks;
+ //last page readed
+ int lastPageIndex;
+ QPixmap lastPage;
+ BookmarksList list;
+ QDateTime added;
+
+ public:
+ Bookmarks();
+ void setLastPage(int index,const QPixmap & page);
+ void setBookmark(int index,const QPixmap & page);
+ void removeBookmark(int index);
+ QList getBookmarkPages() const;
+ QPixmap getBookmarkPixmap(int page) const;
+ QPixmap getLastPagePixmap() const;
+ int getLastPage() const;
+ bool isBookmark(int page);
+ bool imageLoaded(int page);
+ void newComic(const QString & path);
+ void clear();
+ void save();
+
+};
+
+#endif // BOOKMARKS_H
diff --git a/YACReader/bookmarks_dialog.cpp b/YACReader/bookmarks_dialog.cpp
new file mode 100644
index 00000000..40d4007d
--- /dev/null
+++ b/YACReader/bookmarks_dialog.cpp
@@ -0,0 +1,182 @@
+#include "bookmarks_dialog.h"
+
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "bookmarks.h"
+
+BookmarksDialog::BookmarksDialog(QWidget * parent)
+ :QDialog(parent,Qt::FramelessWindowHint)
+{
+ setModal(true);
+
+ animation = new QPropertyAnimation(this,"windowOpacity");
+ animation->setDuration(150);
+
+ QHBoxLayout * layout = new QHBoxLayout();
+
+ //bookmarks
+ QGridLayout * bookmarksL = new QGridLayout();
+
+ pages.push_back(new QLabel(tr("Lastest Page")));
+ for(int i=0;i<3;i++)
+ pages.push_back(new QLabel("-"));
+
+ int heightDesktopResolution = QApplication::desktop()->screenGeometry().height();
+ int height,width;
+ height = heightDesktopResolution*0.50;
+ width = height*0.65;
+
+ coverSize = QSize(width,height);
+
+ for(int i=0;i<4;i++)
+ {
+ QLabel * l = new QLabel();
+ l->setFixedSize(coverSize);
+ l->setScaledContents(false);
+ //l->setPixmap(QPixmap(":/images/notCover.png"));
+ l->installEventFilter(this);
+ images.push_back(l);
+ }
+
+ for(int i=0;i<3;i++)
+ bookmarksL->addWidget(pages.at(i+1),0,i,Qt::AlignCenter);
+
+ for(int i=0;i<3;i++)
+ bookmarksL->addWidget(images.at(i+1),1,i,Qt::AlignCenter);
+
+
+ //last page
+ QGridLayout * lp = new QGridLayout();
+ lp->addWidget(pages.at(0),0,0,Qt::AlignCenter);
+ lp->addWidget(images.at(0),1,0,Qt::AlignCenter);
+
+ layout->addLayout(bookmarksL);
+ QFrame *f = new QFrame( this );
+ f->setFrameStyle( QFrame::VLine | QFrame::Sunken );
+ layout->addWidget(f);
+ layout->addLayout(lp);
+
+ QHBoxLayout * buttons = new QHBoxLayout();
+
+ cancel = new QPushButton(tr("Close"));
+ cancel->setFlat(true);
+ connect(cancel,SIGNAL(clicked()),this,SLOT(hide()));
+ buttons->addStretch();
+ buttons->addWidget(cancel);
+
+ QVBoxLayout * l = new QVBoxLayout();
+
+ l->addWidget(new QLabel(tr("Click on any image to go to the bookmark")),0,Qt::AlignCenter);
+ l->addLayout(layout);
+ l->addLayout(buttons);
+
+ this->setPalette(QPalette(QColor(25,25,25)));
+ //this->setAutoFillBackground(true);
+ setLayout(l);
+}
+
+void BookmarksDialog::setBookmarks(const Bookmarks & bm)
+{
+ lastPage = bm.getLastPage();
+ if (lastPage > 0)
+ {
+ QPixmap p = bm.getLastPagePixmap();
+ if(p.isNull())
+ {
+ images.at(0)->setAlignment(Qt::AlignHCenter|Qt::AlignVCenter);
+ images.at(0)->setText(tr("Loading..."));
+ }
+ else
+ {
+ images.at(0)->setAlignment(Qt::AlignHCenter|Qt::AlignBottom);
+ images.at(0)->setPixmap(p.scaled(coverSize,Qt::KeepAspectRatio,Qt::SmoothTransformation));
+ }
+ }
+ else
+ {
+ images.at(0)->setAlignment(Qt::AlignHCenter|Qt::AlignVCenter);
+ images.at(0)->setPixmap(QPixmap(":/images/notCover.png").scaled(coverSize,Qt::KeepAspectRatio,Qt::SmoothTransformation));
+
+ }
+
+ QList l = bm.getBookmarkPages();
+ int s = l.count();
+ for(int i=0;isetText(QString::number(l.at(i)+1));
+ QPixmap p = bm.getBookmarkPixmap(l.at(i));
+ if(p.isNull())
+ {
+ images.at(i+1)->setAlignment(Qt::AlignHCenter|Qt::AlignVCenter);
+ images.at(i+1)->setText(tr("Loading..."));
+ }
+ else
+ {
+ images.at(i+1)->setAlignment(Qt::AlignHCenter|Qt::AlignBottom);
+ images.at(i+1)->setPixmap(p.scaled(coverSize,Qt::KeepAspectRatio,Qt::SmoothTransformation));
+ }
+ }
+ for(int i=s;i<3;i++)
+ {
+ pages.at(i+1)->setText("-");
+ images.at(i+1)->setAlignment(Qt::AlignHCenter|Qt::AlignVCenter);
+ images.at(i+1)->setPixmap(QPixmap(":/images/notCover.png").scaled(coverSize,Qt::KeepAspectRatio,Qt::SmoothTransformation));
+ }
+}
+
+bool BookmarksDialog::eventFilter(QObject *obj, QEvent *event)
+{
+ if(event->type() == QEvent::MouseButtonPress)
+ {
+ if (obj == images.at(0))
+ {
+ emit(goToPage(lastPage+1));
+ close();
+ event->accept();
+ }
+ for(int i=1;i<=3;i++)
+ {
+ if(obj == images.at(i))
+ {
+ bool b;
+ int page = pages.at(i)->text().toInt(&b);
+ if(b)
+ {
+ emit(goToPage(page));
+ close();
+ }
+ event->accept();
+ }
+ }
+ }
+ // pass the event on to the parent class
+ return QDialog::eventFilter(obj, event);
+}
+
+void BookmarksDialog::keyPressEvent(QKeyEvent * event)
+{
+ if(event->key() == Qt::Key_M)
+ hide();
+}
+
+void BookmarksDialog::show()
+{
+ QDialog::show();
+ disconnect(animation,SIGNAL(finished()),this,SLOT(close()));
+ animation->setStartValue(0);
+ animation->setEndValue(1);
+ animation->start();
+}
+
+void BookmarksDialog::hide()
+{
+ connect(animation,SIGNAL(finished()),this,SLOT(close()));
+ animation->setStartValue(1);
+ animation->setEndValue(0);
+ animation->start();
+}
diff --git a/YACReader/bookmarks_dialog.h b/YACReader/bookmarks_dialog.h
new file mode 100644
index 00000000..363ed372
--- /dev/null
+++ b/YACReader/bookmarks_dialog.h
@@ -0,0 +1,45 @@
+#ifndef __BOOKMARKS_DIALOG_H
+#define __BOOKMARKS_DIALOG_H
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "bookmarks.h"
+
+ class BookmarksDialog : public QDialog
+ {
+ Q_OBJECT
+
+ protected:
+ QList pages;
+ QList images;
+
+ int lastPage;
+
+ QPushButton * accept;
+ QPushButton * cancel;
+
+ QSize coverSize;
+
+ bool eventFilter(QObject *obj, QEvent *event);
+ void keyPressEvent(QKeyEvent * event);
+ QPropertyAnimation * animation;
+
+ public:
+ BookmarksDialog(QWidget * parent = 0);
+
+ public slots:
+ void setBookmarks(const Bookmarks & bookmarks);
+ void show();
+ void hide();
+
+ signals:
+ void goToPage(unsigned int page);
+ };
+
+#endif // BOOKMARKS_DIALOG_H
diff --git a/YACReader/comic.cpp b/YACReader/comic.cpp
new file mode 100644
index 00000000..4be17ce1
--- /dev/null
+++ b/YACReader/comic.cpp
@@ -0,0 +1,289 @@
+#include "comic.h"
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include "bookmarks.h"
+#include "qnaturalsorting.h"
+
+#define EXTENSIONS << "*.jpg" << "*.jpeg" << "*.png" << "*.gif" << "*.tiff" << "*.tif" << "*.bmp"
+
+//-----------------------------------------------------------------------------
+Comic::Comic()
+:_pages(),_index(0),_path(),_loaded(false),bm(new Bookmarks())
+{
+ setup();
+}
+//-----------------------------------------------------------------------------
+Comic::Comic(const QString pathFile)
+:_pages(),_index(0),_path(pathFile),_loaded(false),bm(new Bookmarks())
+{
+ setup();
+ loadFromFile(pathFile);
+}
+//-----------------------------------------------------------------------------
+void Comic::setup()
+{
+ connect(this,SIGNAL(pageChanged(int)),this,SLOT(checkIsBookmark(int)));
+ connect(this,SIGNAL(imageLoaded(int)),this,SLOT(updateBookmarkImage(int)));
+}
+//-----------------------------------------------------------------------------
+void Comic::load(const QString & path)
+{
+ QFileInfo fi(path);
+ bm->newComic(path);
+ emit bookmarksLoaded(*bm);
+ if(fi.isFile())
+ {
+ loadFromFile(path);
+ }
+ else
+ {
+ if(fi.isDir())
+ {
+ loadFromDir(path);
+ }
+ }
+}
+//-----------------------------------------------------------------------------
+void Comic::loadFromFile(const QString & pathFile)
+{
+ _path = QDir::cleanPath(pathFile);
+ //load files size
+ _7z = new QProcess();
+ QStringList attributes;
+ attributes << "l" << "-ssc-" << "-r" << _path EXTENSIONS;
+ connect(_7z,SIGNAL(finished(int,QProcess::ExitStatus)),this,SLOT(loadSizes(void)));
+ connect(_7z,SIGNAL(error(QProcess::ProcessError)),this,SLOT(openingError(QProcess::ProcessError)));
+ _7z->start(QCoreApplication::applicationDirPath()+"/utils/7z",attributes);
+}
+//-----------------------------------------------------------------------------
+void Comic::loadFromDir(const QString & pathDir)
+{
+ _pathDir = pathDir;
+ start();
+}
+//-----------------------------------------------------------------------------
+void Comic::run()
+{
+ QDir d(_pathDir);
+ QStringList l;
+ l EXTENSIONS;
+ d.setNameFilters(l);
+ d.setFilter(QDir::Files|QDir::NoDotAndDotDot);
+ //d.setSorting(QDir::Name|QDir::IgnoreCase|QDir::LocaleAware);
+ QFileInfoList list = d.entryInfoList();
+
+ qSort(list.begin(),list.end(),naturalSortLessThanCIFileInfo);
+
+ int nPages = list.size();
+ _pages.clear();
+ _pages.resize(nPages);
+ if(nPages==0)
+ {
+ QMessageBox::critical(NULL,tr("No images found"),tr("There are not images on the selected folder"));
+ emit errorOpening();
+ }
+ else
+ {
+ emit pageChanged(0); // this indicates new comic, index=0
+ emit numPages(_pages.size());
+ _loaded = true;
+
+ for(int i=0;ireadAllStandardOutput();
+ QList lines = ba.split('\n');
+ QByteArray line;
+ QString name;
+ foreach(line,lines)
+ {
+ if(rx.indexIn(QString(line))!=-1)
+ {
+ _sizes.push_back(rx.cap(1).toInt());
+ name = rx.cap(3).trimmed();
+ _order.push_back(name);
+ _fileNames.push_back(name);
+ }
+ }
+ if(_sizes.size()==0)
+ {
+ QMessageBox::critical(NULL,tr("File error"),tr("File not found or not images in file"));
+ emit errorOpening();
+ return;
+ }
+ _pages.resize(_sizes.size());
+
+ emit pageChanged(0); // this indicates new comic, index=0
+ emit numPages(_pages.size());
+ _loaded = true;
+
+ _cfi=0;
+ qSort(_fileNames.begin(),_fileNames.end(), naturalSortLessThanCI);
+ int i=0;
+ foreach(name,_fileNames)
+ {
+ _newOrder.insert(name,i);
+ i++;
+ }
+ _7ze = new QProcess();
+ QStringList attributes;
+ attributes << "e" << "-ssc-" << "-so" << "-r" << _path EXTENSIONS;
+ connect(_7ze,SIGNAL(error(QProcess::ProcessError)),this,SLOT(openingError(QProcess::ProcessError)));
+ connect(_7ze,SIGNAL(readyReadStandardOutput()),this,SLOT(loadImages(void)));
+ connect(_7ze,SIGNAL(finished(int,QProcess::ExitStatus)),this,SLOT(loadFinished(void)));
+ _7ze->start(QCoreApplication::applicationDirPath()+"/utils/7z",attributes);
+}
+//-----------------------------------------------------------------------------
+void Comic::loadImages()
+{
+
+ QByteArray ba = _7ze->readAllStandardOutput();
+ int s;
+ int rigthIndex;
+ while(ba.size()>0)
+ {
+ rigthIndex = _newOrder.value(_order[_cfi]);
+ s = _pages[rigthIndex].size();
+ _pages[rigthIndex].append(ba.left(_sizes[_cfi]-s));
+ ba.remove(0,_sizes[_cfi]-s);
+ if(_pages[rigthIndex].size()==static_cast(_sizes[_cfi]))
+ {
+ emit imageLoaded(rigthIndex);
+ emit imageLoaded(rigthIndex,_pages[rigthIndex]);
+ _cfi++;
+ }
+ }
+}
+//-----------------------------------------------------------------------------
+void Comic::openingError(QProcess::ProcessError error)
+{
+ switch(error)
+ {
+ case QProcess::FailedToStart:
+ QMessageBox::critical(NULL,tr("7z not found"),tr("7z wasn't found in your PATH."));
+ break;
+ case QProcess::Crashed:
+ QMessageBox::critical(NULL,tr("7z crashed"),tr("7z crashed."));
+ break;
+ case QProcess::ReadError:
+ QMessageBox::critical(NULL,tr("7z reading"),tr("problem reading from 7z"));
+ break;
+ case QProcess::UnknownError:
+ QMessageBox::critical(NULL,tr("7z problem"),tr("Unknown error 7z"));
+ break;
+ default:
+ //TODO
+ break;
+ }
+ _loaded = false;
+ emit errorOpening();
+}
+int Comic::nextPage()
+{
+ if(_index<_pages.size()-1)
+ _index++;
+
+ emit pageChanged(_index);
+
+ return _index;
+}
+//-----------------------------------------------------------------------------
+int Comic::previousPage()
+{
+ if(_index>0)
+ _index--;
+
+ emit pageChanged(_index);
+
+ return _index;
+}
+//-----------------------------------------------------------------------------
+void Comic::setIndex(unsigned int index)
+{
+ if(static_cast(index)<_pages.size()-1)
+ _index = index;
+ else
+ _index = _pages.size()-1;
+
+ emit pageChanged(_index);
+}
+//-----------------------------------------------------------------------------
+QPixmap * Comic::currentPage()
+{
+ QPixmap * p = new QPixmap();
+ p->loadFromData(_pages[_index]);
+ return p;
+}
+//-----------------------------------------------------------------------------
+QPixmap * Comic::operator[](unsigned int index)
+{
+ QPixmap * p = new QPixmap();
+ p->loadFromData(_pages[index]);
+ return p;
+}
+//-----------------------------------------------------------------------------
+bool Comic::loaded()
+{
+ return _loaded;
+}
+//-----------------------------------------------------------------------------
+void Comic::loadFinished()
+{
+ emit imagesLoaded();
+}
+//-----------------------------------------------------------------------------
+void Comic::setBookmark()
+{
+ bm->setBookmark(_index,*operator[](_index));
+ emit bookmarksLoaded(*bm);
+}
+//-----------------------------------------------------------------------------
+void Comic::removeBookmark()
+{
+ bm->removeBookmark(_index);
+ emit bookmarksLoaded(*bm);
+}
+//-----------------------------------------------------------------------------
+void Comic::saveBookmarks()
+{
+ bm->setLastPage(_index,*operator[](_index));
+ bm->save();
+}
+//-----------------------------------------------------------------------------
+void Comic::checkIsBookmark(int index)
+{
+ emit isBookmark(bm->isBookmark(index));
+}
+//-----------------------------------------------------------------------------
+void Comic::updateBookmarkImage(int index)
+{
+ if(bm->isBookmark(index))
+ {
+ bm->setBookmark(index,*operator[](index));
+ emit bookmarksLoaded(*bm);
+ }
+ if(bm->getLastPage() == index)
+ {
+ bm->setLastPage(index,*operator[](index));
+ emit bookmarksLoaded(*bm);
+ }
+
+}
diff --git a/YACReader/comic.h b/YACReader/comic.h
new file mode 100644
index 00000000..2e5a2d49
--- /dev/null
+++ b/YACReader/comic.h
@@ -0,0 +1,70 @@
+#ifndef __COMIC_H
+#define __COMIC_H
+#include
+#include
+#include
+#include
+#include
+
+#include "bookmarks.h"
+
+ class Comic : public QThread
+ {
+ Q_OBJECT
+ private:
+ //Comic pages, one QPixmap for each file.
+ QVector _pages;
+ QVector _sizes;
+ QStringList _fileNames;
+ QMap _newOrder;
+ QVector _order;
+ int _index;
+ QString _path;
+ bool _loaded;
+ QProcess * _7z;
+ QProcess * _7ze;
+ int _cfi;
+ QString _pathDir;
+ Bookmarks * bm;
+ void run();
+ public:
+ //Constructors
+ Comic();
+ Comic(const QString pathFile);
+ void setup();
+ //Load pages from file
+ void load(const QString & path);
+ void loadFromFile(const QString & pathFile);
+ void loadFromDir(const QString & pathDir);
+ int nextPage();
+ int previousPage();
+ void setIndex(unsigned int index);
+ unsigned int getIndex(){return _index;};
+ unsigned int numPages(){return _pages.size();}
+ QPixmap * currentPage();
+ bool loaded();
+ QPixmap * operator[](unsigned int index);
+ QVector * getRawData(){return &_pages;};
+ public slots:
+ void loadImages();
+ void loadSizes();
+ void openingError(QProcess::ProcessError error);
+ void loadFinished();
+ void setBookmark();
+ void removeBookmark();
+ void saveBookmarks();
+ void checkIsBookmark(int index);
+ void updateBookmarkImage(int);
+ signals:
+ void imagesLoaded();
+ void imageLoaded(int index);
+ void imageLoaded(int index,const QByteArray & image);
+ void pageChanged(int index);
+ void numPages(unsigned int numPages);
+ void errorOpening();
+ void isBookmark(bool);
+ void bookmarksLoaded(const Bookmarks &);
+
+ };
+
+#endif
diff --git a/YACReader/configuration.cpp b/YACReader/configuration.cpp
new file mode 100644
index 00000000..1235f06b
--- /dev/null
+++ b/YACReader/configuration.cpp
@@ -0,0 +1,199 @@
+#include "configuration.h"
+
+#include
+#include
+#include
+#include
+#include
+#include
+
+
+
+#define PATH "PATH"
+#define MAG_GLASS_SIZE "MAG_GLASS_SIZE"
+#define ZOOM_LEVEL "ZOOM_LEVEL"
+#define SLIDE_SIZE "SLIDE_SIZE"
+#define FIT "FIT"
+#define FLOW_TYPE "FLOW_TYPE"
+#define FULLSCREEN "FULLSCREEN"
+#define FIT_TO_WIDTH_RATIO "FIT_TO_WIDTH_RATIO"
+#define POS "POS"
+#define SIZE "SIZE"
+#define MAXIMIZED "MAXIMIZED"
+#define DOUBLE_PAGE "DOUBLE_PAGE"
+#define ADJUST_TO_FULL_SIZE "ADJUST_TO_FULL_SIZE"
+#define BACKGROUND_COLOR "BACKGROUND_COLOR"
+#define ALWAYS_ON_TOP "ALWAYS_ON_TOP"
+
+Configuration::Configuration()
+{
+ //read configuration
+ load("/YACReader.conf");
+}
+
+Configuration::Configuration(const Configuration & conf)
+{
+ //nothing
+}
+
+void Configuration::load(const QString & path)
+{
+ //load default configuration
+ defaultPath = ".";
+ magnifyingGlassSize = QSize(350,175);
+ gotoSlideSize = QSize(126,200); //normal
+ //gotoSlideSize = QSize(79,125); //small
+ //gotoSlideSize = QSize(173,275); //big
+ //gotoSlideSize = QSize(220,350); //huge
+ zoomLevel = 0.5;
+ adjustToWidth = true;
+ flowType = PictureFlow::Strip;
+ fullScreen = false;
+ fitToWidthRatio = 1;
+ windowSize = QSize(0,0);
+ maximized = false;
+ doublePage = false;
+ adjustToFullSize = false;
+ backgroundColor = QColor(0,0,0);
+ alwaysOnTop = false;
+
+ //load from file
+ QFile f(QCoreApplication::applicationDirPath()+path);
+ f.open(QIODevice::ReadOnly);
+ QTextStream txtS(&f);
+ QString content = txtS.readAll();
+ QStringList lines = content.split('\n');
+ QString line,name;
+ int i=0;
+ foreach(line,lines)
+ {
+ if((i%2)==0)
+ {
+ name = line.trimmed();
+ }
+ else
+ {
+ if(name==PATH)
+ defaultPath = line.trimmed();
+ else
+ if(name==MAG_GLASS_SIZE)
+ {
+ QStringList values = line.split(',');
+ magnifyingGlassSize = QSize(values[0].toInt(),values[1].toInt());
+ }
+ else
+ if(name==ZOOM_LEVEL)
+ zoomLevel = line.toFloat();
+ else
+ if(name==SLIDE_SIZE)
+ {
+ int height = line.toInt();
+ gotoSlideSize = QSize(static_cast(height/SLIDE_ASPECT_RATIO),height);
+ }
+ else
+ if(name==FIT)
+ adjustToWidth = line.toInt();
+ else
+ if(name==FLOW_TYPE)
+ flowType = (PictureFlow::FlowType)line.toInt();
+ else
+ if(name==FULLSCREEN)
+ fullScreen = line.toInt();
+ else
+ if(name==FIT_TO_WIDTH_RATIO)
+ fitToWidthRatio = line.toFloat();
+ else
+ if(name==POS)
+ {
+ QStringList l = line.split(',');
+ windowPos = QPoint(l[0].toInt(),l[1].toInt());
+ }
+ else
+ if(name==SIZE)
+ {
+ QStringList l = line.split(',');
+ windowSize = QSize(l[0].toInt(),l[1].toInt());
+ }
+ else
+ if(name==MAXIMIZED)
+ maximized = line.toInt();
+ else
+ if(name==DOUBLE_PAGE)
+ doublePage = line.toInt();
+ else
+ if(name==ADJUST_TO_FULL_SIZE)
+ adjustToFullSize = line.toInt();
+ else
+ if(name==BACKGROUND_COLOR)
+ {
+ QStringList l = line.split(',');
+ backgroundColor = QColor(l[0].toInt(),l[1].toInt(),l[2].toInt());
+ }
+ else
+ if(name==ALWAYS_ON_TOP)
+ alwaysOnTop = line.toInt();
+
+
+
+ }
+ i++;
+ }
+}
+
+void Configuration::save()
+{
+ QFile f(QCoreApplication::applicationDirPath()+"/YACReader.conf");
+ if(!f.open(QIODevice::WriteOnly))
+ {
+ QMessageBox::critical(NULL,tr("Saving config file...."),tr("There was a problem saving YACReader configuration. Please, check if you have enough permissions in the YACReader root folder."));
+ }
+ else
+ {
+ QTextStream txtS(&f);
+
+ txtS << PATH << "\n";
+ txtS << defaultPath << "\n";
+
+ txtS << MAG_GLASS_SIZE << "\n";
+ txtS << magnifyingGlassSize.width() <<","<< magnifyingGlassSize.height() << "\n";
+
+ txtS << ZOOM_LEVEL << "\n";
+ txtS << zoomLevel << "\n";
+
+ txtS << SLIDE_SIZE << "\n";
+ txtS << gotoSlideSize.height() << "\n";
+
+ txtS << FIT << "\n";
+ txtS << (int)adjustToWidth << "\n";
+
+ txtS << FLOW_TYPE << "\n";
+ txtS << (int)flowType << "\n";
+
+ txtS << FULLSCREEN << "\n";
+ txtS << (int)fullScreen << "\n";
+
+ txtS << FIT_TO_WIDTH_RATIO << "\n";
+ txtS << fitToWidthRatio << "\n";
+
+ txtS << POS << "\n";
+ txtS << windowPos.x() << "," << windowPos.y() << "\n";
+
+ txtS << SIZE << "\n";
+ txtS << windowSize.width() << "," << windowSize.height() << "\n";
+
+ txtS << MAXIMIZED << "\n";
+ txtS << (int)maximized << "\n";
+
+ txtS << DOUBLE_PAGE << "\n";
+ txtS << (int)doublePage << "\n";
+
+ txtS << ADJUST_TO_FULL_SIZE << "\n";
+ txtS << (int) adjustToFullSize << "\n";
+
+ txtS << BACKGROUND_COLOR << "\n";
+ txtS << backgroundColor.red() << "," << backgroundColor.green() << "," << backgroundColor.blue() << "\n";
+
+ txtS << ALWAYS_ON_TOP << "\n";
+ txtS << (int)alwaysOnTop << "\n";
+ }
+}
diff --git a/YACReader/configuration.h b/YACReader/configuration.h
new file mode 100644
index 00000000..f2644d51
--- /dev/null
+++ b/YACReader/configuration.h
@@ -0,0 +1,77 @@
+#ifndef __CONFIGURATION_H
+#define __CONFIGURATION_H
+#include
+#include
+#include
+#include "pictureflow.h"
+
+#define CONF_FILE_PATH "."
+#define SLIDE_ASPECT_RATIO 1.585
+
+ class Configuration : public QObject
+ {
+ Q_OBJECT
+
+ private:
+ QString defaultPath;
+ //configuration properties
+ QSize magnifyingGlassSize;
+ QSize gotoSlideSize;
+ float zoomLevel;
+ bool adjustToWidth;
+ bool fullScreen;
+ PictureFlow::FlowType flowType;
+ float fitToWidthRatio;
+ QPoint windowPos;
+ QSize windowSize;
+ bool maximized;
+ bool doublePage;
+ bool alwaysOnTop;
+ bool adjustToFullSize;
+ QColor backgroundColor;
+
+ Configuration();
+ Configuration(const Configuration & conf);
+ void load(const QString & path = CONF_FILE_PATH);
+
+ public:
+ static Configuration & getConfiguration()
+ {
+ static Configuration configuration;
+ return configuration;
+ };
+ QString getDefaultPath() { return defaultPath; };
+ void setDefaultPath(QString defaultPath){this->defaultPath = defaultPath;};
+ QSize getMagnifyingGlassSize() { return magnifyingGlassSize;};
+ void setMagnifyingGlassSize(const QSize & mgs) { magnifyingGlassSize = mgs;};
+ QSize getGotoSlideSize() { return gotoSlideSize;};
+ void setGotoSlideSize(const QSize & gss) { gotoSlideSize = gss;};
+ float getZoomLevel() { return zoomLevel;};
+ void setZoomLevel(float zl) { zoomLevel = zl;};
+ bool getAdjustToWidth() {return adjustToWidth;};
+ void setAdjustToWidth(bool atw=true) {adjustToWidth = atw;};
+ PictureFlow::FlowType getFlowType(){return flowType;};
+ void setFlowType(PictureFlow::FlowType type){flowType = type;};
+ bool getFullScreen(){return fullScreen;};
+ void setFullScreen(bool f){fullScreen = f;};
+ float getFitToWidthRatio(){return fitToWidthRatio;};
+ void setFitToWidthRatio(float r){fitToWidthRatio = r;};
+ QPoint getPos(){return windowPos;};
+ void setPos(QPoint p){windowPos = p;};
+ QSize getSize(){return windowSize;};
+ void setSize(QSize s){windowSize = s;};
+ bool getMaximized(){return maximized;};
+ void setMaximized(bool b){maximized = b;};
+ bool getDoublePage(){return doublePage;};
+ void setDoublePage(bool b){doublePage = b;};
+ void setAdjustToFullSize(bool b){adjustToFullSize = b;};
+ bool getAdjustToFullSize(){return adjustToFullSize;};
+ void setBackgroundColor(const QColor& color){backgroundColor = color;};
+ QColor getBackgroundColor(){return backgroundColor;};
+ void setAlwaysOnTop(bool b){alwaysOnTop = b;};
+ bool getAlwaysOnTop(){return alwaysOnTop;};
+ void save();
+
+ };
+
+#endif
diff --git a/YACReader/files.qrc b/YACReader/files.qrc
new file mode 100644
index 00000000..9dcfa4f3
--- /dev/null
+++ b/YACReader/files.qrc
@@ -0,0 +1,15 @@
+
+
+ ../files/about.html
+ ../files/helpYACReader.html
+ ../files/shortcuts.html
+ ../files/shortcuts2.html
+ ../files/translator.html
+ ./yacreader_es.qm
+
+
+
+ ../files/about_es_ES.html
+ ../files/helpYACReader_es_ES.html
+
+
diff --git a/YACReader/goto_dialog.cpp b/YACReader/goto_dialog.cpp
new file mode 100644
index 00000000..8b8dd66d
--- /dev/null
+++ b/YACReader/goto_dialog.cpp
@@ -0,0 +1,75 @@
+#include "goto_dialog.h"
+
+#include
+#include
+#include
+
+
+
+GoToDialog::GoToDialog(QWidget * parent)
+:QDialog(parent)
+{
+ setupUI();
+}
+
+void GoToDialog::setupUI()
+{
+ textLabel = new QLabel(tr("Page : "));
+ pageNumber = new QLineEdit;
+ v = new QIntValidator(this);
+ v->setBottom(1);
+ pageNumber->setValidator(v);
+ textLabel->setBuddy(pageNumber);
+ textLabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
+
+ accept = new QPushButton(tr("Go To"));
+ connect(accept,SIGNAL(clicked()),this,SLOT(goTo()));
+ cancel = new QPushButton(tr("Cancel"));
+ connect(cancel,SIGNAL(clicked()),this,SLOT(close()));
+
+ QHBoxLayout *topLayout = new QHBoxLayout;
+
+ topLayout->addWidget(textLabel);
+ topLayout->addWidget(pageNumber);
+
+ QHBoxLayout *bottomLayout = new QHBoxLayout;
+ bottomLayout->addStretch();
+ bottomLayout->addWidget(accept);
+ bottomLayout->addWidget(cancel);
+
+ QVBoxLayout *mainLayout = new QVBoxLayout;
+ mainLayout->addWidget(numPagesLabel = new QLabel(tr("Total pages : ")));
+ mainLayout->addLayout(topLayout);
+ mainLayout->addStretch();
+ mainLayout->addLayout(bottomLayout);
+
+ QHBoxLayout *imgMainLayout = new QHBoxLayout;
+ QLabel * imgLabel = new QLabel();
+ QPixmap p(":/images/goto.png");
+ imgLabel->setPixmap(p);
+ imgMainLayout->addWidget(imgLabel);
+ imgMainLayout->addLayout(mainLayout);
+
+ setLayout(imgMainLayout);
+
+ setWindowTitle(tr("Go to..."));
+ setModal (true);
+}
+
+void GoToDialog::goTo()
+{
+ unsigned int page = pageNumber->text().toInt();
+ pageNumber->clear();
+
+ if(page >= 1)
+ emit(goToPage(page));
+
+ close();
+
+}
+
+void GoToDialog::setNumPages(unsigned int numPages)
+{
+ numPagesLabel->setText(tr("Total pages : ")+QString::number(numPages));
+ v->setTop(numPages);
+}
diff --git a/YACReader/goto_dialog.h b/YACReader/goto_dialog.h
new file mode 100644
index 00000000..9d13e647
--- /dev/null
+++ b/YACReader/goto_dialog.h
@@ -0,0 +1,31 @@
+#ifndef __GOTODIALOG_H
+#define __GOTODIALOG_H
+
+#include
+#include
+#include
+#include
+#include
+
+ class GoToDialog : public QDialog
+ {
+ Q_OBJECT
+ public:
+ GoToDialog(QWidget * parent = 0);
+ private:
+ QLabel * numPagesLabel;
+ QLabel * textLabel;
+ QLineEdit * pageNumber;
+ QIntValidator * v;
+ QPushButton * accept;
+ QPushButton * cancel;
+ void setupUI();
+ public slots:
+ void goTo();
+ void setNumPages(unsigned int numPages);
+ signals:
+ void goToPage(unsigned int page);
+ };
+
+#endif
+
diff --git a/YACReader/goto_flow.cpp b/YACReader/goto_flow.cpp
new file mode 100644
index 00000000..edb8fd17
--- /dev/null
+++ b/YACReader/goto_flow.cpp
@@ -0,0 +1,373 @@
+#include "goto_flow.h"
+#include "configuration.h"
+#include "comic.h"
+#include "custom_widgets.h"
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+/*#define WIDTH 126
+#define HEIGHT 200*/
+
+QMutex mutexGoToFlow;
+
+
+
+GoToFlow::GoToFlow(QWidget *parent,PictureFlow::FlowType flowType)
+:QWidget(parent),ready(false)
+{
+ updateTimer = new QTimer;
+ connect(updateTimer, SIGNAL(timeout()), this, SLOT(updateImageData()));
+
+ worker = new PageLoader;
+
+ QVBoxLayout * layout = new QVBoxLayout(this);
+ flow = new YACReaderFlow(this,flowType);
+ flow->setReflectionEffect(PictureFlow::PlainReflection);
+ imageSize = Configuration::getConfiguration().getGotoSlideSize();
+
+ flow->setSlideSize(imageSize);
+ connect(flow,SIGNAL(centerIndexChanged(int)),this,SLOT(setPageNumber(int)));
+ connect(flow,SIGNAL(selected(unsigned int)),this,SLOT(goTo()));
+
+ QHBoxLayout * bottom = new QHBoxLayout(this);
+ bottom->addStretch();
+ bottom->addWidget(new QLabel(tr("Page : "),this));
+ bottom->addWidget(edit = new QLineEdit(this));
+ v = new QIntValidator(this);
+ v->setBottom(1);
+ edit->setValidator(v);
+ edit->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
+ edit->setFixedWidth(40);
+ edit->setSizePolicy(QSizePolicy(QSizePolicy::Fixed,QSizePolicy::Minimum));
+
+ centerButton = new QPushButton(this);
+ centerButton->setIcon(QIcon(":/images/center.png"));
+ connect(centerButton,SIGNAL(clicked()),this,SLOT(centerSlide()));
+ bottom->addWidget(centerButton);
+
+ goToButton = new QPushButton(this);
+ goToButton->setIcon(QIcon(":/images/goto.png"));
+ connect(goToButton,SIGNAL(clicked()),this,SLOT(goTo()));
+ bottom->addWidget(goToButton);
+
+ bottom->addStretch();
+
+ layout->addWidget(flow);
+ layout->addLayout(bottom);
+ layout->setStretchFactor(flow,1);
+ layout->setStretchFactor(bottom,0);
+ layout->setMargin(0);
+ layout->setSpacing(0);
+ setLayout(layout);
+ this->setAutoFillBackground(true);
+ resize(static_cast(5*imageSize.width()),static_cast(imageSize.height()*1.7));
+
+ //install eventFilter
+ //flow->installEventFilter(this);
+ edit->installEventFilter(this);
+ centerButton->installEventFilter(this);
+ goToButton->installEventFilter(this);
+
+ connect(edit,SIGNAL(returnPressed()),goToButton,SIGNAL(clicked()));
+
+ this->setCursor(QCursor(Qt::ArrowCursor));
+}
+
+void GoToFlow::goTo()
+{
+ //emit(goToPage(flow->centerIndex()+1));
+ emit(goToPage(edit->text().toInt()));
+}
+
+void GoToFlow::setPageNumber(int page)
+{
+ edit->setText(QString::number(page+1));
+}
+
+void GoToFlow::centerSlide()
+{
+ int page = edit->text().toInt()-1;
+ int distance = flow->centerIndex()-page;
+
+ if(abs(distance)>10)
+ {
+ if(distance<0)
+ flow->setCenterIndex(flow->centerIndex()+(-distance)-10);
+ else
+ flow->setCenterIndex(flow->centerIndex()-distance+10);
+ }
+
+ flow->showSlide(page);
+}
+
+void GoToFlow::centerSlide(int slide)
+{
+ if(flow->centerIndex()!=slide)
+ {
+ flow->setCenterIndex(slide);
+ if(ready)// load images if pages are loaded.
+ {
+ //worker->reset(); //BUG FIXED : image didn't load if worker was working
+ preload();
+ }
+ }
+}
+
+void GoToFlow::setNumSlides(unsigned int slides)
+{
+ // numPagesLabel->setText(tr("Total pages : ")+QString::number(slides));
+ // numPagesLabel->adjustSize();
+ imagesReady.clear();
+ imagesReady.fill(false,slides);
+
+ rawImages.clear();
+ rawImages.resize(slides);
+
+ v->setTop(slides);
+
+ SlideInitializer * si = new SlideInitializer(flow,slides);
+
+ imagesLoaded.clear();
+ imagesLoaded.fill(false,slides);
+
+ imagesSetted.clear();
+ imagesSetted.fill(false,slides);
+
+ numImagesLoaded = 0;
+
+ connect(flow, SIGNAL(centerIndexChanged(int)), this, SLOT(preload()));
+
+ ready = true;
+ worker->reset();
+
+ si->start();
+}
+
+void GoToFlow::reset()
+{
+ updateTimer->stop();
+ /*imagesLoaded.clear();
+ numImagesLoaded = 0;
+ imagesReady.clear();
+ rawImages.clear();*/
+ ready = false;
+}
+
+void GoToFlow::setImageReady(int index,const QByteArray & image)
+{
+ rawImages[index]=image;
+ imagesReady[index]=true;
+ preload();
+}
+
+void GoToFlow::preload()
+{
+ if(numImagesLoaded < imagesLoaded.size())
+ updateTimer->start(30); //TODO comprobar rendimiento, antes era 70
+}
+
+void GoToFlow::updateImageData()
+{
+ // can't do anything, wait for the next possibility
+ if(worker->busy())
+ return;
+
+ // set image of last one
+ int idx = worker->index();
+ if( idx >= 0 && !worker->result().isNull())
+ {
+ if(!imagesSetted[idx])
+ {
+ flow->setSlide(idx, worker->result());
+ imagesSetted[idx] = true;
+ numImagesLoaded++;
+ rawImages[idx].clear();; //release memory
+ }
+
+ }
+
+ // try to load only few images on the left and right side
+ // i.e. all visible ones plus some extra
+#define COUNT 8
+ int indexes[2*COUNT+1];
+ int center = flow->centerIndex();
+ indexes[0] = center;
+ for(int j = 0; j < COUNT; j++)
+ {
+ indexes[j*2+1] = center+j+1;
+ indexes[j*2+2] = center-j-1;
+ }
+ for(int c = 0; c < 2*COUNT+1; c++)
+ {
+ int i = indexes[c];
+ if((i >= 0) && (i < flow->slideCount()))
+ if(!imagesLoaded[i]&&imagesReady[i])//slide(i).isNull())
+ {
+ // schedule thumbnail generation
+ imagesLoaded[i]=true;
+ worker->generate(i, flow->slideSize(),rawImages[i]);
+ return;
+ }
+
+ }
+
+ // no need to generate anything? stop polling...
+ updateTimer->stop();
+}
+
+bool GoToFlow::eventFilter(QObject *target, QEvent *event)
+{
+ if (event->type() == QEvent::KeyPress)
+ {
+ QKeyEvent *keyEvent = static_cast(event);
+ int key = keyEvent->key();
+ if((key==Qt::Key_Return)||
+ (key==Qt::Key_Enter)||
+ (key==Qt::Key_Space)||
+ (key==Qt::Key_Left)||
+ (key==Qt::Key_Right)||
+ (key==Qt::Key_S))
+ this->keyPressEvent(keyEvent);
+ }
+ return QWidget::eventFilter(target, event);
+}
+
+
+void GoToFlow::keyPressEvent(QKeyEvent* event)
+{
+ switch (event->key())
+ {
+ case Qt::Key_Return: case Qt::Key_Enter:
+ goTo();
+ centerSlide();
+ break;
+ case Qt::Key_Space:
+ centerSlide();
+ break;
+ case Qt::Key_S:
+ QCoreApplication::sendEvent(this->parent(),event);
+ break;
+ case Qt::Key_Left: case Qt::Key_Right:
+ QCoreApplication::sendEvent(flow,event);
+ }
+
+ event->accept();
+}
+
+void GoToFlow::wheelEvent(QWheelEvent * event)
+{
+ if(event->delta()<0)
+ flow->showNext();
+ else
+ flow->showPrevious();
+ event->accept();
+}
+
+void GoToFlow::setFlowType(PictureFlow::FlowType flowType)
+{
+ flow->setFlowType(flowType);
+}
+
+void GoToFlow::updateSize() //TODO : fix. it doesn't work.
+{
+ imageSize = Configuration::getConfiguration().getGotoSlideSize();
+ flow->setSlideSize(imageSize);
+ resize(static_cast(5*imageSize.width()),static_cast(imageSize.height()*1.7));
+}
+//-----------------------------------------------------------------------------
+//SlideInitializer
+//-----------------------------------------------------------------------------
+SlideInitializer::SlideInitializer(PictureFlow * flow,int slides)
+:QThread(),_flow(flow),_slides(slides)
+{
+
+}
+void SlideInitializer::run()
+{
+ mutexGoToFlow.lock();
+
+ _flow->clear();
+ for(int i=0;i<_slides;i++)
+ _flow->addSlide(QImage());
+ _flow->setCenterIndex(0);
+
+ mutexGoToFlow.unlock();
+}
+//-----------------------------------------------------------------------------
+//PageLoader
+//-----------------------------------------------------------------------------
+
+
+PageLoader::PageLoader():
+QThread(), restart(false), working(false), idx(-1)
+{
+}
+
+PageLoader::~PageLoader()
+{
+ mutexGoToFlow.lock();
+ condition.wakeOne();
+ mutexGoToFlow.unlock();
+ wait();
+}
+
+bool PageLoader::busy() const
+{
+ return isRunning() ? working : false;
+}
+
+void PageLoader::generate(int index, QSize size,const QByteArray & rImage)
+{
+ mutexGoToFlow.lock();
+ this->idx = index;
+ //this->img = QImage();
+ this->size = size;
+ this->rawImage = rImage;
+ mutexGoToFlow.unlock();
+
+ if (!isRunning())
+ start();
+ else
+ {
+ // already running, wake up whenever ready
+ restart = true;
+ condition.wakeOne();
+ }
+}
+
+void PageLoader::run()
+{
+ for(;;)
+ {
+ // copy necessary data
+ mutexGoToFlow.lock();
+ this->working = true;
+ //int idx = this->idx;
+
+
+ QImage image;
+ image.loadFromData(this->rawImage);
+ // let everyone knows it is ready
+ image = image.scaled(this->size,Qt::KeepAspectRatio,Qt::SmoothTransformation);
+
+ mutexGoToFlow.unlock();
+
+ mutexGoToFlow.lock();
+ this->working = false;
+ this->img = image;
+ mutexGoToFlow.unlock();
+
+ // put to sleep
+ mutexGoToFlow.lock();
+ if (!this->restart)
+ condition.wait(&mutexGoToFlow);
+ restart = false;
+ mutexGoToFlow.unlock();
+ }
+}
diff --git a/YACReader/goto_flow.h b/YACReader/goto_flow.h
new file mode 100644
index 00000000..c521f2f4
--- /dev/null
+++ b/YACReader/goto_flow.h
@@ -0,0 +1,105 @@
+#ifndef __GOTO_FLOW_H
+#define __GOTO_FLOW_H
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include "custom_widgets.h"
+class Comic;
+
+class SlideInitializer;
+class PageLoader;
+
+class GoToFlow : public QWidget
+{
+ Q_OBJECT
+public:
+ GoToFlow(QWidget* parent = 0,PictureFlow::FlowType flowType = PictureFlow::CoverFlowLike);
+ bool ready; //comic is ready for read.
+ void keyPressEvent(QKeyEvent* event);
+ bool eventFilter(QObject *target, QEvent *event);
+private:
+ YACReaderFlow * flow;
+ QLineEdit * edit;
+ QIntValidator * v;
+ QPushButton * centerButton;
+ QPushButton * goToButton;
+ Comic * comic;
+ QSize imageSize;
+
+ QVector imagesLoaded;
+ QVector imagesSetted;
+ uint numImagesLoaded;
+ QVector imagesReady;
+ QVector rawImages;
+ QTimer* updateTimer;
+ PageLoader* worker;
+ virtual void wheelEvent(QWheelEvent * event);
+
+ private slots:
+ void preload();
+ void updateImageData();
+
+ public slots:
+ void goTo();
+ void setPageNumber(int page);
+ void centerSlide();
+ void centerSlide(int slide);
+ void reset();
+ void setNumSlides(unsigned int slides);
+ void setImageReady(int index,const QByteArray & image);
+ void setFlowType(PictureFlow::FlowType flowType);
+ void updateSize();
+signals:
+ void goToPage(unsigned int page);
+
+
+};
+//-----------------------------------------------------------------------------
+//SlideInitializer
+//-----------------------------------------------------------------------------
+class SlideInitializer : public QThread
+{
+public:
+ SlideInitializer(PictureFlow * flow,int slides);
+private:
+ PictureFlow * _flow;
+ int _slides;
+ void run();
+};
+//-----------------------------------------------------------------------------
+//PageLoader
+//-----------------------------------------------------------------------------
+class PageLoader : public QThread
+{
+public:
+ PageLoader();
+ ~PageLoader();
+ // returns FALSE if worker is still busy and can't take the task
+ bool busy() const;
+ void generate(int index, QSize size,const QByteArray & rImage);
+ void reset(){idx = -1;};
+ int index() const { return idx; }
+ QImage result() const { return img; }
+protected:
+ void run();
+private:
+ QWaitCondition condition;
+
+ bool restart;
+ bool working;
+ int idx;
+
+ QSize size;
+ QImage img;
+ QByteArray rawImage;
+};
+
+#endif
diff --git a/YACReader/icon.ico b/YACReader/icon.ico
new file mode 100644
index 00000000..6c31de5a
Binary files /dev/null and b/YACReader/icon.ico differ
diff --git a/YACReader/icon.rc b/YACReader/icon.rc
new file mode 100644
index 00000000..86e8e9b3
--- /dev/null
+++ b/YACReader/icon.rc
@@ -0,0 +1 @@
+IDI_ICON1 ICON DISCARDABLE "icon.ico"
diff --git a/YACReader/images.qrc b/YACReader/images.qrc
new file mode 100644
index 00000000..2aab79e4
--- /dev/null
+++ b/YACReader/images.qrc
@@ -0,0 +1,67 @@
+
+
+ ../images/open.png
+ ../images/openFolder.png
+ ../images/next.png
+ ../images/prev.png
+ ../images/icon.png
+ ../images/zoom.png
+ ../images/fit.png
+ ../images/goto.png
+ ../images/help.png
+ ../images/center.png
+ ../images/options.png
+ ../images/comicFolder.png
+ ../images/save.png
+ ../images/rotateL.png
+ ../images/rotateR.png
+ ../images/flow1.png
+ ../images/flow2.png
+ ../images/flow3.png
+ ../images/bookmark.png
+ ../images/setBookmark.png
+ ../images/notCover.png
+ ../images/previousComic.png
+ ../images/nextComic.png
+ ../images/deleteLibrary.png
+ ../images/properties.png
+ ../images/doublePage.png
+ ../images/shortcuts.png
+ ../images/close.png
+ ../images/up.png
+ ../images/down.png
+ ../images/dictionary.png
+ ../images/alwaysOnTop.png
+ ../images/adjustToFullSize.png
+ ../images/helpImages/open.png
+ ../images/helpImages/openFolder.png
+ ../images/helpImages/next.png
+ ../images/helpImages/prev.png
+ ../images/helpImages/icon.png
+ ../images/helpImages/zoom.png
+ ../images/helpImages/fit.png
+ ../images/helpImages/goto.png
+ ../images/helpImages/help.png
+ ../images/helpImages/center.png
+ ../images/helpImages/options.png
+ ../images/helpImages/comicFolder.png
+ ../images/helpImages/save.png
+ ../images/helpImages/rotateL.png
+ ../images/helpImages/rotateR.png
+ ../images/helpImages/flow1.png
+ ../images/helpImages/flow2.png
+ ../images/helpImages/flow3.png
+ ../images/helpImages/bookmark.png
+ ../images/helpImages/setBookmark.png
+ ../images/helpImages/notCover.png
+ ../images/helpImages/previousComic.png
+ ../images/helpImages/nextComic.png
+ ../images/helpImages/deleteLibrary.png
+ ../images/helpImages/properties.png
+ ../images/helpImages/doublePage.png
+ ../images/helpImages/shortcuts.png
+ ../images/helpImages/keyboard.png
+ ../images/helpImages/mouse.png
+ ../images/helpImages/speaker.png
+
+
diff --git a/YACReader/magnifying_glass.cpp b/YACReader/magnifying_glass.cpp
new file mode 100644
index 00000000..766716a3
--- /dev/null
+++ b/YACReader/magnifying_glass.cpp
@@ -0,0 +1,267 @@
+#include "magnifying_glass.h"
+#include "viewer.h"
+
+
+
+MagnifyingGlass::MagnifyingGlass(int w, int h, QWidget * parent)
+:QLabel(parent),zoomLevel(0.5)
+{
+ setup(QSize(w,h));
+}
+
+MagnifyingGlass::MagnifyingGlass(const QSize & size, QWidget * parent)
+:QLabel(parent),zoomLevel(0.5)
+{
+ setup(size);
+}
+
+void MagnifyingGlass::setup(const QSize & size)
+{
+ resize(size);
+ setScaledContents(true);
+ setMouseTracking(true);
+ setCursor(QCursor(Qt::BlankCursor));
+}
+
+void MagnifyingGlass::mouseMoveEvent(QMouseEvent * event)
+{
+ updateImage();
+}
+
+void MagnifyingGlass::updateImage(int x, int y)
+{
+ //image section augmented
+ int zoomWidth = static_cast(width() * zoomLevel);
+ int zoomHeight = static_cast(height() * zoomLevel);
+ Viewer * p = (Viewer *)parent();
+ int currentPos = p->verticalScrollBar()->sliderPosition();
+ const QPixmap * image = p->pixmap();
+ int iWidth = image->width();
+ int iHeight = image->height();
+ float wFactor = static_cast(iWidth) / p->widget()->width();
+ float hFactor = static_cast(iHeight) / p->widget()->height();
+ zoomWidth *= wFactor;
+ zoomHeight *= hFactor;
+ if(p->verticalScrollBar()->minimum()==p->verticalScrollBar()->maximum())
+ {
+ int xp = static_cast(((x-p->widget()->pos().x())*wFactor)-zoomWidth/2);
+ int yp = static_cast((y-p->widget()->pos().y()+currentPos)*hFactor-zoomHeight/2);
+ int xOffset=0;
+ int yOffset=0;
+ int zw=zoomWidth;
+ int zh=zoomHeight;
+ //int wOffset,hOffset=0;
+ bool outImage = false;
+ if(xp<0)
+ {
+ xOffset = -xp;
+ xp=0;
+ zw = zw - xOffset;
+ outImage = true;
+ }
+ if(yp<0)
+ {
+ yOffset = -yp;
+ yp=0;
+ zh = zh - yOffset;
+ outImage = true;
+ }
+
+ if(xp+zoomWidth >= image->width())
+ {
+ zw -= xp+zw - image->width();
+ outImage = true;
+ }
+ if(yp+zoomHeight >= image->height())
+ {
+ zh -= yp+zh - image->height();
+ outImage = true;
+ }
+ if(outImage)
+ {
+ QImage img(zoomWidth,zoomHeight,QImage::Format_RGB32);
+ img.fill(0);
+ if(zw>0&&zh>0)
+ {
+ QPainter painter(&img);
+ painter.drawPixmap(xOffset,yOffset,p->pixmap()->copy(xp,yp,zw,zh));
+ }
+ setPixmap(QPixmap().fromImage(img));
+ }
+ else
+ setPixmap(p->pixmap()->copy(xp,yp,zoomWidth,zoomHeight));
+ }
+ else
+ {
+ int xp = static_cast(((x-p->widget()->pos().x())*wFactor)-zoomWidth/2);
+ int yp = static_cast((y+currentPos)*hFactor-zoomHeight/2);
+ int xOffset=0;
+ int yOffset=0;
+ int zw=zoomWidth;
+ int zh=zoomHeight;
+ //int wOffset,hOffset=0;
+ bool outImage = false;
+ if(xp<0)
+ {
+ xOffset = -xp;
+ xp=0;
+ zw = zw - xOffset;
+ outImage = true;
+ }
+ if(yp<0)
+ {
+ yOffset = -yp;
+ yp=0;
+ zh = zh - yOffset;
+ outImage = true;
+ }
+
+ if(xp+zoomWidth >= image->width())
+ {
+ zw -= xp+zw - image->width();
+ outImage = true;
+ }
+ if(yp+zoomHeight >= image->height())
+ {
+ zh -= yp+zh - image->height();
+ outImage = true;
+ }
+ if(outImage)
+ {
+ QImage img(zoomWidth,zoomHeight,QImage::Format_RGB32);
+ img.fill(0);
+ if(zw>0&&zh>0)
+ {
+ QPainter painter(&img);
+ painter.drawPixmap(xOffset,yOffset,p->pixmap()->copy(xp,yp,zw,zh));
+ }
+ setPixmap(QPixmap().fromImage(img));
+ }
+ else
+ setPixmap(p->pixmap()->copy(xp,yp,zoomWidth,zoomHeight));
+ }
+ move(static_cast(x-float(width())/2),static_cast(y-float(height())/2));
+}
+
+void MagnifyingGlass::updateImage()
+{
+ if(isVisible())
+ {
+ QPoint p = QPoint(cursor().pos().x(),cursor().pos().y());
+ p = this->parentWidget()->mapFromGlobal(p);
+ updateImage(p.x(),p.y());
+ }
+}
+void MagnifyingGlass::wheelEvent(QWheelEvent * event)
+{
+ switch(event->modifiers())
+ {
+ //size
+ case Qt::NoModifier:
+ if(event->delta()<0)
+ sizeUp();
+ else
+ sizeDown();
+ break;
+ //size height
+ case Qt::ControlModifier:
+ if(event->delta()<0)
+ heightUp();
+ else
+ heightDown();
+ break;
+ //size width
+ case Qt::AltModifier:
+ if(event->delta()<0)
+ widthUp();
+ else
+ widthDown();
+ break;
+ //zoom level
+ case Qt::ShiftModifier:
+ if(event->delta()<0)
+ zoomIn();
+ else
+ zoomOut();
+ break;
+ }
+ updateImage();
+ event->setAccepted(true);
+}
+void MagnifyingGlass::zoomIn()
+{
+ if(zoomLevel>0.2)
+ zoomLevel -= 0.025;
+}
+
+void MagnifyingGlass::zoomOut()
+{
+ if(zoomLevel<0.9)
+ zoomLevel += 0.025;
+}
+
+void MagnifyingGlass::sizeUp()
+{
+ Viewer * p = (Viewer *)parent();
+ if(width()<(p->width()*0.90))
+ resize(width()+30,height()+15);
+}
+
+void MagnifyingGlass::sizeDown()
+{
+ if(width()>175)
+ resize(width()-30,height()-15);
+}
+
+void MagnifyingGlass::heightUp()
+{
+ Viewer * p = (Viewer *)parent();
+ if(height()<(p->height()*0.90))
+ resize(width(),height()+15);
+}
+
+void MagnifyingGlass::heightDown()
+{
+ if(height()>80)
+ resize(width(),height()-15);
+}
+
+void MagnifyingGlass::widthUp()
+{
+ Viewer * p = (Viewer *)parent();
+ if(width()<(p->width()*0.90))
+ resize(width()+30,height());
+}
+
+void MagnifyingGlass::widthDown()
+{
+ if(width()>175)
+ resize(width()-30,height());
+}
+
+void MagnifyingGlass::keyPressEvent(QKeyEvent *event)
+{
+ bool validKey = false;
+ switch (event->key())
+ {
+ case Qt::Key_Plus:
+ sizeUp();
+ validKey = true;
+ break;
+ case Qt::Key_Minus:
+ sizeDown();
+ validKey = true;
+ break;
+ case Qt::Key_Underscore:
+ zoomOut();
+ validKey = true;
+ break;
+ case Qt::Key_Asterisk:
+ zoomIn();
+ validKey = true;
+ break;
+ }
+ updateImage();
+ if(validKey)
+ event->setAccepted(true);
+}
diff --git a/YACReader/magnifying_glass.h b/YACReader/magnifying_glass.h
new file mode 100644
index 00000000..519e3404
--- /dev/null
+++ b/YACReader/magnifying_glass.h
@@ -0,0 +1,34 @@
+#ifndef __MAGNIFYING_GLASS
+#define __MAGNIFYING_GLASS
+
+#include
+#include
+#include
+#include
+
+ class MagnifyingGlass : public QLabel
+ {
+ Q_OBJECT
+ private:
+ float zoomLevel;
+ void setup(const QSize & size);
+ void keyPressEvent(QKeyEvent * event);
+ public:
+ MagnifyingGlass(int width,int height,QWidget * parent);
+ MagnifyingGlass(const QSize & size, QWidget * parent);
+ void mouseMoveEvent(QMouseEvent * event);
+ public slots:
+ void updateImage(int x, int y);
+ void updateImage();
+ void wheelEvent(QWheelEvent * event);
+ void zoomIn();
+ void zoomOut();
+ void sizeUp();
+ void sizeDown();
+ void heightUp();
+ void heightDown();
+ void widthUp();
+ void widthDown();
+ };
+
+#endif
diff --git a/YACReader/main.cpp b/YACReader/main.cpp
new file mode 100644
index 00000000..911aba72
--- /dev/null
+++ b/YACReader/main.cpp
@@ -0,0 +1,34 @@
+#include
+#include
+#include
+//#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include "main_window_viewer.h"
+#include "configuration.h"
+
+
+int main(int argc, char * argv[])
+{
+ QApplication app(argc, argv);
+
+ QTranslator translator;
+ QString sufix = QLocale::system().name();
+ translator.load(":/yacreader_"+sufix);
+ app.installTranslator(&translator);
+ app.setApplicationName("YACReader");
+
+ MainWindowViewer mwv;
+ mwv.show();
+
+ int ret = app.exec();
+
+ Configuration::getConfiguration().save();
+
+ return ret;
+}
diff --git a/YACReader/main_window_viewer.cpp b/YACReader/main_window_viewer.cpp
new file mode 100644
index 00000000..7bbfaac0
--- /dev/null
+++ b/YACReader/main_window_viewer.cpp
@@ -0,0 +1,680 @@
+#include "main_window_viewer.h"
+#include "configuration.h"
+#include "viewer.h"
+#include "goto_dialog.h"
+#include "custom_widgets.h"
+#include "options_dialog.h"
+#include "check_new_version.h"
+#include "comic.h"
+#include "bookmarks_dialog.h"
+#include "shortcuts_dialog.h"
+
+
+MainWindowViewer::MainWindowViewer()
+:QMainWindow(),fullscreen(false),toolbars(true),alwaysOnTop(false),currentDirectory("."),currentDirectoryImgDest(".")
+{
+ loadConfiguration();
+ setupUI();
+}
+
+void MainWindowViewer::loadConfiguration()
+{
+ Configuration & config = Configuration::getConfiguration();
+ currentDirectory = config.getDefaultPath();
+ fullscreen = config.getFullScreen();
+}
+
+void MainWindowViewer::setupUI()
+{
+
+ setWindowIcon(QIcon(":/images/icon.png"));
+
+ viewer = new Viewer(this);
+ connect(viewer,SIGNAL(reset()),this,SLOT(disableActions()));
+
+ setCentralWidget(viewer);
+ int heightDesktopResolution = QApplication::desktop()->screenGeometry().height();
+ int widthDesktopResolution = QApplication::desktop()->screenGeometry().width();
+ int height,width;
+ height = static_cast(heightDesktopResolution*0.84);
+ width = static_cast(height*0.70);
+ Configuration & conf = Configuration::getConfiguration();
+ QPoint p = conf.getPos();
+ QSize s = conf.getSize();
+ if(s.width()!=0)
+ {
+ move(p);
+ resize(s);
+ }
+ else
+ {
+ move(QPoint((widthDesktopResolution-width)/2,((heightDesktopResolution-height)-40)/2));
+ resize(QSize(width,height));
+ }
+
+ had = new HelpAboutDialog(this); //TODO load data
+
+ had->loadAboutInformation(":/files/about.html");
+ had->loadHelp(":/files/helpYACReader.html");
+
+ optionsDialog = new OptionsDialog(this);
+ connect(optionsDialog,SIGNAL(accepted()),viewer,SLOT(updateOptions()));
+
+ shortcutsDialog = new ShortcutsDialog(this);
+
+ createActions();
+ createToolBars();
+ if(QCoreApplication::argc()>1)
+ {
+ //TODO: new method open(QString)
+ QString pathFile = QCoreApplication::arguments().at(1);
+ currentDirectory = pathFile;
+ QFileInfo fi(pathFile);
+ getSiblingComics(fi.absolutePath(),fi.fileName());
+ viewer->open(pathFile);
+ enableActions();
+ }
+
+ versionChecker = new HttpVersionChecker();
+
+ connect(versionChecker,SIGNAL(newVersionDetected()),
+ this,SLOT(newVersion()));
+
+ versionChecker->get();
+
+ viewer->setFocusPolicy(Qt::StrongFocus);
+
+ setWindowTitle("YACReader");
+
+ if(Configuration::getConfiguration().getAlwaysOnTop())
+ {
+ setWindowFlags(this->windowFlags() | Qt::CustomizeWindowHint | Qt::WindowStaysOnTopHint);
+ }
+
+ if(fullscreen)
+ toFullScreen();
+ if(conf.getMaximized())
+ showMaximized();
+
+ setAcceptDrops(true);
+}
+
+void MainWindowViewer::createActions()
+{
+ openAction = new QAction(tr("&Open"),this);
+ openAction->setShortcut(tr("O"));
+ openAction->setIcon(QIcon(":/images/open.png"));
+ openAction->setToolTip(tr("Open a comic"));
+ connect(openAction, SIGNAL(triggered()), this, SLOT(open()));
+
+ openFolderAction = new QAction(tr("Open Folder"),this);
+ openFolderAction->setShortcut(tr("Ctrl+O"));
+ openFolderAction->setIcon(QIcon(":/images/openFolder.png"));
+ openFolderAction->setToolTip(tr("Open image folder"));
+ connect(openFolderAction, SIGNAL(triggered()), this, SLOT(openFolder()));
+
+ saveImageAction = new QAction(tr("Save"),this);
+ saveImageAction->setIcon(QIcon(":/images/save.png"));
+ saveImageAction->setToolTip(tr("Save current page"));
+ saveImageAction->setDisabled(true);
+ connect(saveImageAction,SIGNAL(triggered()),this,SLOT(saveImage()));
+
+ openPreviousComicAction = new QAction(tr("Previous Comic"),this);
+ openPreviousComicAction->setIcon(QIcon(":/images/previousComic.png"));
+ openPreviousComicAction->setShortcut(Qt::CTRL + Qt::Key_Left);
+ openPreviousComicAction->setToolTip(tr("Open previous comic"));
+ openPreviousComicAction->setDisabled(true);
+ connect(openPreviousComicAction,SIGNAL(triggered()),this,SLOT(openPreviousComic()));
+
+ openNextComicAction = new QAction(tr("Next Comic"),this);
+ openNextComicAction->setIcon(QIcon(":/images/nextComic.png"));
+ openNextComicAction->setShortcut(Qt::CTRL + Qt::Key_Right);
+ openNextComicAction->setToolTip(tr("Open next comic"));
+ openNextComicAction->setDisabled(true);
+ connect(openNextComicAction,SIGNAL(triggered()),this,SLOT(openNextComic()));
+
+ prevAction = new QAction(tr("&Previous"),this);
+ prevAction->setIcon(QIcon(":/images/prev.png"));
+ prevAction->setShortcut(Qt::Key_Left);
+ prevAction->setToolTip(tr("Go to previous page"));
+ prevAction->setDisabled(true);
+ connect(prevAction, SIGNAL(triggered()),viewer,SLOT(prev()));
+
+ nextAction = new QAction(tr("&Next"),this);
+ nextAction->setIcon(QIcon(":/images/next.png"));
+ nextAction->setShortcut(Qt::Key_Right);
+ nextAction->setToolTip(tr("Go to next page"));
+ nextAction->setDisabled(true);
+ connect(nextAction, SIGNAL(triggered()),viewer,SLOT(next()));
+
+ adjustWidth = new QAction(tr("Fit Width"),this);
+ adjustWidth->setShortcut(tr("A"));
+ adjustWidth->setIcon(QIcon(":/images/fit.png"));
+ adjustWidth->setCheckable(true);
+ adjustWidth->setDisabled(true);
+ adjustWidth->setChecked(Configuration::getConfiguration().getAdjustToWidth());
+ adjustWidth->setToolTip(tr("Fit image to ..."));
+ //adjustWidth->setIcon(QIcon(":/images/fitWidth.png"));
+ connect(adjustWidth, SIGNAL(triggered()),this,SLOT(changeFit()));
+
+ leftRotationAction = new QAction(tr("Rotate image to the left"),this);
+ leftRotationAction->setShortcut(tr("L"));
+ leftRotationAction->setIcon(QIcon(":/images/rotateL.png"));
+ leftRotationAction->setDisabled(true);
+ connect(leftRotationAction, SIGNAL(triggered()),viewer,SLOT(rotateLeft()));
+
+ rightRotationAction = new QAction(tr("Rotate image to the right"),this);
+ rightRotationAction->setShortcut(tr("R"));
+ rightRotationAction->setIcon(QIcon(":/images/rotateR.png"));
+ rightRotationAction->setDisabled(true);
+ connect(rightRotationAction, SIGNAL(triggered()),viewer,SLOT(rotateRight()));
+
+ doublePageAction = new QAction(tr("Double page mode"),this);
+ doublePageAction->setToolTip(tr("Switch to double page mode"));
+ doublePageAction->setShortcut(tr("D"));
+ doublePageAction->setIcon(QIcon(":/images/doublePage.png"));
+ doublePageAction->setDisabled(true);
+ doublePageAction->setCheckable(true);
+ doublePageAction->setChecked(Configuration::getConfiguration().getDoublePage());
+ connect(doublePageAction, SIGNAL(triggered()),viewer,SLOT(doublePageSwitch()));
+
+ goToPage = new QAction(tr("Go To"),this);
+ goToPage->setShortcut(tr("G"));
+ goToPage->setIcon(QIcon(":/images/goto.png"));
+ goToPage->setDisabled(true);
+ goToPage->setToolTip(tr("Go to page ..."));
+ connect(goToPage, SIGNAL(triggered()),viewer,SLOT(showGoToDialog()));
+
+ optionsAction = new QAction(tr("Options"),this);
+ optionsAction->setShortcut(tr("C"));
+ optionsAction->setToolTip(tr("YACReader options"));
+ optionsAction->setIcon(QIcon(":/images/options.png"));
+
+ connect(optionsAction, SIGNAL(triggered()),optionsDialog,SLOT(show()));
+
+ helpAboutAction = new QAction(tr("Help"),this);
+ helpAboutAction->setToolTip(tr("Help, About YACReader"));
+ helpAboutAction->setShortcut(Qt::Key_F1);
+ helpAboutAction->setIcon(QIcon(":/images/help.png"));
+ connect(helpAboutAction, SIGNAL(triggered()),had,SLOT(show()));
+
+ showMagnifyingGlass = new QAction(tr("Magnifying glass"),this);
+ showMagnifyingGlass->setToolTip(tr("Switch Magnifying glass"));
+ showMagnifyingGlass->setShortcut(tr("Z"));
+ showMagnifyingGlass->setIcon(QIcon(":/images/zoom.png"));
+ showMagnifyingGlass->setDisabled(true);
+ showMagnifyingGlass->setCheckable(true);
+ connect(showMagnifyingGlass, SIGNAL(triggered()),viewer,SLOT(magnifyingGlassSwitch()));
+
+ setBookmark = new QAction(tr("Set bookmark"),this);
+ setBookmark->setToolTip(tr("Set a bookmark on the current page"));
+ setBookmark->setShortcut(Qt::CTRL+Qt::Key_M);
+ setBookmark->setIcon(QIcon(":/images/setBookmark.png"));
+ setBookmark->setDisabled(true);
+ setBookmark->setCheckable(true);
+ connect(setBookmark,SIGNAL(triggered (bool)),viewer,SLOT(setBookmark(bool)));
+ connect(viewer,SIGNAL(pageAvailable(bool)),setBookmark,SLOT(setEnabled(bool)));
+ connect(viewer,SIGNAL(pageIsBookmark(bool)),setBookmark,SLOT(setChecked(bool)));
+
+ showBookmarks = new QAction(tr("Show bookmarks"),this);
+ showBookmarks->setToolTip(tr("Show the bookmarks of the current comic"));
+ showBookmarks->setShortcut(tr("M"));
+ showBookmarks->setIcon(QIcon(":/images/bookmark.png"));
+ showBookmarks->setDisabled(true);
+ connect(showBookmarks, SIGNAL(triggered()),viewer->getBookmarksDialog(),SLOT(show()));
+
+ showShorcutsAction = new QAction(tr("Show keyboard shortcuts"), this );
+ showShorcutsAction->setIcon(QIcon(":/images/shortcuts.png"));
+ connect(showShorcutsAction, SIGNAL(triggered()),shortcutsDialog,SLOT(show()));
+
+ showInfo = new QAction(tr("Show Info"),this);
+ showInfo->setShortcut(tr("I"));
+ showInfo->setIcon(QIcon(":/images/properties.png"));
+ showInfo->setDisabled(true);
+ connect(showInfo, SIGNAL(triggered()),viewer,SLOT(informationSwitch()));
+
+ closeAction = new QAction(tr("Close"),this);
+ closeAction->setShortcut(Qt::Key_Escape);
+ closeAction->setIcon(QIcon(":/images/deleteLibrary.png"));
+ connect(closeAction,SIGNAL(triggered()),this,SLOT(close()));
+
+ showDictionaryAction = new QAction(tr("Show Dictionary"),this);
+ showDictionaryAction->setShortcut(Qt::Key_T);
+ showDictionaryAction->setIcon(QIcon(":/images/dictionary.png"));
+ showDictionaryAction->setCheckable(true);
+ showDictionaryAction->setDisabled(true);
+ connect(showDictionaryAction,SIGNAL(triggered()),viewer,SLOT(translatorSwitch()));
+
+ alwaysOnTopAction = new QAction(tr("Always on top"),this);
+ alwaysOnTopAction->setShortcut(Qt::Key_Q);
+ alwaysOnTopAction->setIcon(QIcon(":/images/alwaysOnTop.png"));
+ alwaysOnTopAction->setCheckable(true);
+ alwaysOnTopAction->setDisabled(true);
+ alwaysOnTopAction->setChecked(Configuration::getConfiguration().getAlwaysOnTop());
+ connect(alwaysOnTopAction,SIGNAL(triggered()),this,SLOT(alwaysOnTopSwitch()));
+
+ adjustToFullSizeAction = new QAction(tr("Show full size"),this);
+ adjustToFullSizeAction->setShortcut(Qt::Key_W);
+ adjustToFullSizeAction->setIcon(QIcon(":/images/adjustToFullSize.png"));
+ adjustToFullSizeAction->setCheckable(true);
+ adjustToFullSizeAction->setDisabled(true);
+ adjustToFullSizeAction->setChecked(Configuration::getConfiguration().getAdjustToFullSize());
+ connect(adjustToFullSizeAction,SIGNAL(triggered()),this,SLOT(adjustToFullSizeSwitch()));
+}
+
+void MainWindowViewer::createToolBars()
+{
+ comicToolBar = addToolBar(tr("&File"));
+
+ QToolButton * tb = new QToolButton();
+ tb->addAction(openAction);
+ tb->addAction(openFolderAction);
+ tb->setPopupMode(QToolButton::MenuButtonPopup);
+ tb->setDefaultAction(openAction);
+
+ comicToolBar->addWidget(tb);
+ comicToolBar->addAction(saveImageAction);
+ comicToolBar->addAction(openPreviousComicAction);
+ comicToolBar->addAction(openNextComicAction);
+
+ comicToolBar->addSeparator();
+ comicToolBar->addAction(prevAction);
+ comicToolBar->addAction(nextAction);
+ comicToolBar->addAction(goToPage);
+
+ comicToolBar->addSeparator();
+ comicToolBar->addAction(alwaysOnTopAction);
+
+ comicToolBar->addSeparator();
+ comicToolBar->addAction(adjustWidth);
+ comicToolBar->addAction(adjustToFullSizeAction);
+ comicToolBar->addAction(leftRotationAction);
+ comicToolBar->addAction(rightRotationAction);
+ comicToolBar->addAction(doublePageAction);
+
+ comicToolBar->addSeparator();
+ comicToolBar->addAction(showMagnifyingGlass);
+
+ comicToolBar->addSeparator();
+ comicToolBar->addAction(setBookmark);
+ comicToolBar->addAction(showBookmarks);
+
+ comicToolBar->addSeparator();
+ comicToolBar->addAction(showDictionaryAction);
+
+ comicToolBar->addWidget(new QToolBarStretch());
+
+ comicToolBar->addAction(showShorcutsAction);
+ comicToolBar->addAction(optionsAction);
+ comicToolBar->addAction(helpAboutAction);
+ comicToolBar->addAction(closeAction);
+
+ comicToolBar->setMovable(false);
+
+
+ viewer->addAction(openAction);
+ viewer->addAction(openFolderAction);
+ viewer->addAction(saveImageAction);
+ viewer->addAction(openPreviousComicAction);
+ viewer->addAction(openNextComicAction);
+ QAction * separator = new QAction("",this);
+ separator->setSeparator(true);
+ viewer->addAction(separator);
+ viewer->addAction(prevAction);
+ viewer->addAction(nextAction);
+ viewer->addAction(goToPage);
+ viewer->addAction(adjustWidth);
+ viewer->addAction(adjustToFullSizeAction);
+ viewer->addAction(leftRotationAction);
+ viewer->addAction(rightRotationAction);
+ viewer->addAction(doublePageAction);
+ separator = new QAction("",this);
+ separator->setSeparator(true);
+ viewer->addAction(separator);
+
+ viewer->addAction(setBookmark);
+ viewer->addAction(showBookmarks);
+ separator = new QAction("",this);
+ separator->setSeparator(true);
+ viewer->addAction(separator);
+
+ viewer->addAction(showDictionaryAction);
+ separator = new QAction("",this);
+ separator->setSeparator(true);
+ viewer->addAction(separator);
+
+ viewer->addAction(showMagnifyingGlass);
+ viewer->addAction(optionsAction);
+ viewer->addAction(helpAboutAction);
+ viewer->addAction(showInfo);
+ viewer->addAction(showShorcutsAction);
+ separator = new QAction("",this);
+ separator->setSeparator(true);
+ viewer->addAction(separator);
+ viewer->addAction(closeAction);
+
+ viewer->setContextMenuPolicy(Qt::ActionsContextMenu);
+}
+
+void MainWindowViewer::open()
+{
+ QFileDialog openDialog;
+ QString pathFile = openDialog.getOpenFileName(this,tr("Open Comic"),currentDirectory,tr("Comic files (*.cbr *.cbz *.rar *.zip *.tar *.arj)"));
+ if (!pathFile.isEmpty())
+ {
+ openComicFromPath(pathFile);
+ }
+}
+
+void MainWindowViewer::openComicFromPath(QString pathFile)
+{
+ currentDirectory = pathFile;
+ QFileInfo fi(pathFile);
+ getSiblingComics(fi.absolutePath(),fi.fileName());
+ viewer->open(pathFile);
+ enableActions();
+}
+
+void MainWindowViewer::openFolder()
+{
+ QFileDialog openDialog;
+ QString pathDir = openDialog.getExistingDirectory(this,tr("Open folder"),currentDirectory);
+ if (!pathDir.isEmpty())
+ {
+ openFolderFromPath(pathDir);
+ }
+}
+
+void MainWindowViewer::openFolderFromPath(QString pathDir)
+{
+ currentDirectory = pathDir; //TODO ??
+ QFileInfo fi(pathDir);
+ getSiblingComics(fi.absolutePath(),fi.fileName());
+ viewer->open(pathDir);
+ enableActions();
+}
+
+void MainWindowViewer::saveImage()
+{
+ QFileDialog saveDialog;
+ QString pathFile = saveDialog.getSaveFileName(this,tr("Save current page"),currentDirectoryImgDest,tr("Image files (*.jpg)"));
+ if (!pathFile.isEmpty())
+ {
+ currentDirectoryImgDest = pathFile;
+ const QPixmap * p = viewer->pixmap();
+ if(p!=NULL)
+ p->save(pathFile);
+ }
+}
+
+void MainWindowViewer::enableActions()
+{
+ saveImageAction->setDisabled(false);
+ prevAction->setDisabled(false);
+ nextAction->setDisabled(false);
+ adjustWidth->setDisabled(false);
+ goToPage->setDisabled(false);
+ alwaysOnTopAction->setDisabled(false);
+ leftRotationAction->setDisabled(false);
+ rightRotationAction->setDisabled(false);
+ showMagnifyingGlass->setDisabled(false);
+ doublePageAction->setDisabled(false);
+ adjustToFullSizeAction->setDisabled(false);
+ //setBookmark->setDisabled(false);
+ showBookmarks->setDisabled(false);
+ showInfo->setDisabled(false); //TODO enable goTo and showInfo (or update) when numPages emited
+ showDictionaryAction->setDisabled(false);
+}
+void MainWindowViewer::disableActions()
+{
+ saveImageAction->setDisabled(true);
+ prevAction->setDisabled(true);
+ nextAction->setDisabled(true);
+ adjustWidth->setDisabled(true);
+ goToPage->setDisabled(true);
+ alwaysOnTopAction->setDisabled(true);
+ leftRotationAction->setDisabled(true);
+ rightRotationAction->setDisabled(true);
+ showMagnifyingGlass->setDisabled(true);
+ doublePageAction->setDisabled(true);
+ adjustToFullSizeAction->setDisabled(true);
+ setBookmark->setDisabled(true);
+ showBookmarks->setDisabled(true);
+ showInfo->setDisabled(true); //TODO enable goTo and showInfo (or update) when numPages emited
+ openPreviousComicAction->setDisabled(true);
+ openNextComicAction->setDisabled(true);
+ showDictionaryAction->setDisabled(true);
+}
+
+void MainWindowViewer::keyPressEvent(QKeyEvent *event)
+{
+ switch (event->key())
+ {
+ case Qt::Key_Escape:
+ this->close();
+ break;
+ case Qt::Key_F:
+ toggleFullScreen();
+ break;
+ case Qt::Key_H:
+ toggleToolBars();
+ break;
+ case Qt::Key_O:
+ open();
+ break;
+ default:
+ QWidget::keyPressEvent(event);
+ break;
+ }
+}
+
+void MainWindowViewer::mouseDoubleClickEvent ( QMouseEvent * event )
+{
+ toggleFullScreen();
+ event->accept();
+}
+
+void MainWindowViewer::toggleFullScreen()
+{
+ fullscreen?toNormal():toFullScreen();
+ Configuration::getConfiguration().setFullScreen(fullscreen = !fullscreen);
+}
+
+void MainWindowViewer::toFullScreen()
+{
+ hideToolBars();
+ viewer->hide();
+ viewer->fullscreen = true;//TODO, change by the right use of windowState();
+ showFullScreen();
+ viewer->show();
+ if(viewer->magnifyingGlassIsVisible())
+ viewer->showMagnifyingGlass();
+}
+
+void MainWindowViewer::toNormal()
+{
+ //show all
+ viewer->hide();
+ viewer->fullscreen = false;//TODO, change by the right use of windowState();
+ //viewer->hideMagnifyingGlass();
+ showNormal();
+ showToolBars();
+ viewer->show();
+ if(viewer->magnifyingGlassIsVisible())
+ viewer->showMagnifyingGlass();
+}
+void MainWindowViewer::toggleToolBars()
+{
+ toolbars?hideToolBars():showToolBars();
+}
+void MainWindowViewer::hideToolBars()
+{
+ //hide all
+ this->comicToolBar->hide();
+ toolbars = false;
+}
+
+void MainWindowViewer::showToolBars()
+{
+ this->comicToolBar->show();
+ toolbars = true;
+}
+
+void MainWindowViewer::changeFit()
+{
+ Configuration & conf = Configuration::getConfiguration();
+ conf.setAdjustToWidth(!conf.getAdjustToWidth());
+ viewer->updatePage();
+}
+
+void MainWindowViewer::newVersion()
+{
+ QMessageBox msgBox;
+ msgBox.setText(tr("There is a new version avaliable"));
+ msgBox.setInformativeText(tr("Do you want to download the new version?"));
+ msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
+ msgBox.setDefaultButton(QMessageBox::Yes);
+ int ret = msgBox.exec();
+
+ if(ret==QMessageBox::Yes){
+ QDesktopServices::openUrl(QUrl("http://code.google.com/p/yacreader/"));
+ }
+}
+
+
+
+
+
+void MainWindowViewer::closeEvent ( QCloseEvent * event )
+{
+ viewer->save();
+ Configuration & conf = Configuration::getConfiguration();
+ if(!fullscreen && !isMaximized())
+ {
+ conf.setPos(pos());
+ conf.setSize(size());
+ }
+ conf.setMaximized(isMaximized());
+}
+
+void MainWindowViewer::openPreviousComic()
+{
+ if(!previousComicPath.isEmpty())
+ {
+ viewer->open(previousComicPath);
+ QFileInfo fi(previousComicPath);
+ getSiblingComics(fi.absolutePath(),fi.fileName());
+ }
+}
+
+void MainWindowViewer::openNextComic()
+{
+ if(!nextComicPath.isEmpty())
+ {
+ viewer->open(nextComicPath);
+ QFileInfo fi(nextComicPath);
+ getSiblingComics(fi.absolutePath(),fi.fileName());
+ }
+}
+
+void MainWindowViewer::getSiblingComics(QString path,QString currentComic)
+{
+ QDir d(path);
+ d.setFilter(QDir::Files|QDir::NoDotAndDotDot);
+ d.setNameFilters(QStringList() << "*.cbr" << "*.cbz" << "*.rar" << "*.zip" << "*.tar");
+ d.setSorting(QDir::Name|QDir::IgnoreCase|QDir::LocaleAware);
+ QStringList list = d.entryList();
+ int index = list.indexOf(currentComic);
+ if(index == -1) //comic not found
+ {
+ QFile f(QCoreApplication::applicationDirPath()+"/errorLog.txt");
+ if(!f.open(QIODevice::WriteOnly))
+ {
+ QMessageBox::critical(NULL,tr("Saving error log file...."),tr("There was a problem saving YACReader error log file. Please, check if you have enough permissions in the YACReader root folder."));
+ }
+ else
+ {
+ QTextStream txtS(&f);
+ txtS << "METHOD : MainWindowViewer::getSiblingComics" << '\n';
+ txtS << "ERROR : current comic not found in its own path" << '\n';
+ txtS << path << '\n';
+ txtS << currentComic << '\n';
+ txtS << "Comic list count : " + list.count() << '\n';
+ foreach(QString s, list){
+ txtS << s << '\n';
+ }
+ f.close();
+ }
+ }
+
+ previousComicPath = nextComicPath = "";
+ if(index>0)
+ {
+ previousComicPath = path+"/"+list.at(index-1);
+ openPreviousComicAction->setDisabled(false);
+ }
+ else
+ openPreviousComicAction->setDisabled(true);
+
+ if(index+1setDisabled(false);
+ }
+ else
+ openNextComicAction->setDisabled(true);
+}
+
+void MainWindowViewer::dropEvent(QDropEvent *event)
+{
+ QList urlList;
+ QString fName;
+ QFileInfo info;
+
+ if (event->mimeData()->hasUrls())
+ {
+ urlList = event->mimeData()->urls();
+
+ if ( urlList.size() > 0)
+ {
+ fName = urlList[0].toLocalFile(); // convert first QUrl to local path
+ info.setFile( fName ); // information about file
+ if (info.isFile())
+ openComicFromPath(fName); // if is file, setText
+ else
+ if(info.isDir())
+ openFolderFromPath(fName);
+ }
+ }
+
+ event->acceptProposedAction();
+}
+void MainWindowViewer::dragEnterEvent(QDragEnterEvent *event)
+{
+ // accept just text/uri-list mime format
+ if (event->mimeData()->hasFormat("text/uri-list"))
+ {
+ event->acceptProposedAction();
+ }
+}
+
+void MainWindowViewer::alwaysOnTopSwitch()
+{
+ if(!Configuration::getConfiguration().getAlwaysOnTop())
+ {
+ setWindowFlags(this->windowFlags() | Qt::CustomizeWindowHint | Qt::WindowStaysOnTopHint); //always on top
+ show();
+ }
+ else
+ {
+ setWindowFlags(this->windowFlags() ^ (Qt::CustomizeWindowHint | Qt::WindowStaysOnTopHint));
+ show();
+ }
+ Configuration::getConfiguration().setAlwaysOnTop(!Configuration::getConfiguration().getAlwaysOnTop());
+}
+
+void MainWindowViewer::adjustToFullSizeSwitch()
+{
+ Configuration::getConfiguration().setAdjustToFullSize(!Configuration::getConfiguration().getAdjustToFullSize());
+ viewer->updatePage();
+}
\ No newline at end of file
diff --git a/YACReader/main_window_viewer.h b/YACReader/main_window_viewer.h
new file mode 100644
index 00000000..c6221510
--- /dev/null
+++ b/YACReader/main_window_viewer.h
@@ -0,0 +1,115 @@
+#ifndef __MAIN_WINDOW_VIEWER_H
+#define __MAIN_WINDOW_VIEWER_H
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+class Comic;
+class Viewer;
+class OptionsDialog;
+class HelpAboutDialog;
+class HttpVersionChecker;
+class ShortcutsDialog;
+
+
+ class MainWindowViewer : public QMainWindow
+ {
+ Q_OBJECT
+
+ public slots:
+ void open();
+ void openFolder();
+ void saveImage();
+ void toggleToolBars();
+ void hideToolBars();
+ void showToolBars();
+ void changeFit();
+ void enableActions();
+ void disableActions();
+ void toggleFullScreen();
+ void toFullScreen();
+ void toNormal();
+ void loadConfiguration();
+ void newVersion();
+ void openPreviousComic();
+ void openNextComic();
+ void openComicFromPath(QString pathFile);
+ void openFolderFromPath(QString pathDir);
+ void alwaysOnTopSwitch();
+ void adjustToFullSizeSwitch();
+ /*void viewComic();
+ void prev();
+ void next();
+ void updatePage();*/
+
+ private:
+ //!State
+ bool fullscreen;
+ bool toolbars;
+ bool alwaysOnTop;
+
+ QString currentDirectory;
+ QString currentDirectoryImgDest;
+ //!Widgets
+ Viewer * viewer;
+ //GoToDialog * goToDialog;
+ OptionsDialog * optionsDialog;
+ HelpAboutDialog * had;
+ ShortcutsDialog * shortcutsDialog;
+
+ //! ToolBars
+ QToolBar *comicToolBar;
+
+ //! Actions
+ QAction *openAction;
+ QAction *openFolderAction;
+ QAction *saveImageAction;
+ QAction *openPreviousComicAction;
+ QAction *openNextComicAction;
+ QAction *nextAction;
+ QAction *prevAction;
+ QAction *adjustWidth;
+ QAction *adjustHeight;
+ QAction *goToPage;
+ QAction *optionsAction;
+ QAction *helpAboutAction;
+ QAction *showMagnifyingGlass;
+ QAction *setBookmark;
+ QAction *showBookmarks;
+ QAction *leftRotationAction;
+ QAction *rightRotationAction;
+ QAction *showInfo;
+ QAction *closeAction;
+ QAction *doublePageAction;
+ QAction *showShorcutsAction;
+ QAction *showDictionaryAction;
+ QAction *alwaysOnTopAction;
+ QAction *adjustToFullSizeAction;
+
+ HttpVersionChecker * versionChecker;
+ QString previousComicPath;
+ QString nextComicPath;
+ //! Mtodo que inicializa el interfaz.
+ void setupUI();
+ void createActions();
+ void createToolBars();
+ void getSiblingComics(QString path,QString currentComic);
+
+ //! Manejadores de evento:
+ void keyPressEvent(QKeyEvent *event);
+ //void resizeEvent(QResizeEvent * event);
+ void mouseDoubleClickEvent ( QMouseEvent * event );
+ void dropEvent(QDropEvent *event);
+ void dragEnterEvent(QDragEnterEvent *event);
+
+ protected:
+ virtual void closeEvent ( QCloseEvent * event );
+ public:
+ MainWindowViewer();
+
+ };
+#endif
diff --git a/YACReader/options_dialog.cpp b/YACReader/options_dialog.cpp
new file mode 100644
index 00000000..e45b124c
--- /dev/null
+++ b/YACReader/options_dialog.cpp
@@ -0,0 +1,188 @@
+#include "options_dialog.h"
+#include "configuration.h"
+#include
+#include
+#include
+#include
+#include
+
+
+OptionsDialog::OptionsDialog(QWidget * parent)
+:QDialog(parent)
+{
+ QVBoxLayout * layout = new QVBoxLayout(this);
+
+ QGroupBox *slideSizeBox = new QGroupBox(tr("\"Go to flow\" size"));
+ //slideSizeLabel = new QLabel(,this);
+ slideSize = new QSlider(this);
+ slideSize->setMinimum(125);
+ slideSize->setMaximum(350);
+ slideSize->setPageStep(5);
+ slideSize->setOrientation(Qt::Horizontal);
+ QHBoxLayout * slideLayout = new QHBoxLayout();
+ slideLayout->addWidget(slideSize);
+ slideSizeBox->setLayout(slideLayout);
+
+ QGroupBox *pathBox = new QGroupBox(tr("My comics path"));
+
+ QHBoxLayout * path = new QHBoxLayout();
+ path->addWidget(pathEdit = new QLineEdit());
+ path->addWidget(pathFindButton = new QPushButton(QIcon(":/images/comicFolder.png"),""));
+ pathBox->setLayout(path);
+
+ connect(pathFindButton,SIGNAL(clicked()),this,SLOT(findFolder()));
+
+ accept = new QPushButton(tr("Save"));
+ cancel = new QPushButton(tr("Cancel"));
+ connect(accept,SIGNAL(clicked()),this,SLOT(saveOptions()));
+ connect(cancel,SIGNAL(clicked()),this,SLOT(restoreOptions()));
+ connect(cancel,SIGNAL(clicked()),this,SLOT(close()));
+
+ QGroupBox *groupBox = new QGroupBox(tr("How to show pages in GoToFlow:"));
+
+ radio1 = new QRadioButton(tr("CoverFlow look"));
+ radio2 = new QRadioButton(tr("Stripe look"));
+ radio3 = new QRadioButton(tr("Overlapped Stripe look"));
+
+
+ QVBoxLayout *vbox = new QVBoxLayout;
+ QHBoxLayout * opt1 = new QHBoxLayout;
+ opt1->addWidget(radio1);
+ QLabel * lOpt1 = new QLabel();
+ lOpt1->setPixmap(QPixmap(":/images/flow1.png"));
+ opt1->addStretch();
+ opt1->addWidget(lOpt1);
+ vbox->addLayout(opt1);
+
+ QHBoxLayout * opt2 = new QHBoxLayout;
+ opt2->addWidget(radio2);
+ QLabel * lOpt2 = new QLabel();
+ lOpt2->setPixmap(QPixmap(":/images/flow2.png"));
+ opt2->addStretch();
+ opt2->addWidget(lOpt2);
+ vbox->addLayout(opt2);
+
+ QHBoxLayout * opt3 = new QHBoxLayout;
+ opt3->addWidget(radio3);
+ QLabel * lOpt3 = new QLabel();
+ lOpt3->setPixmap(QPixmap(":/images/flow3.png"));
+ opt3->addStretch();
+ opt3->addWidget(lOpt3);
+ vbox->addLayout(opt3);
+
+
+ //vbox->addStretch(1);
+ groupBox->setLayout(vbox);
+
+ //fitToWidthRatioLabel = new QLabel(tr("Page width stretch"),this);
+ QGroupBox *fitBox = new QGroupBox(tr("Page width stretch"));
+ fitToWidthRatioS = new QSlider(this);
+ fitToWidthRatioS->setMinimum(50);
+ fitToWidthRatioS->setMaximum(100);
+ fitToWidthRatioS->setPageStep(5);
+ fitToWidthRatioS->setOrientation(Qt::Horizontal);
+ QHBoxLayout * fitLayout = new QHBoxLayout;
+ fitLayout->addWidget(fitToWidthRatioS);
+ fitBox->setLayout(fitLayout);
+
+ QHBoxLayout * colorSelection = new QHBoxLayout;
+ backgroundColor = new QLabel();
+ QPalette pal = backgroundColor->palette();
+ pal.setColor(backgroundColor->backgroundRole(), Qt::black);
+ backgroundColor->setPalette(pal);
+ backgroundColor->setAutoFillBackground(true);
+
+ colorDialog = new QColorDialog(Qt::red,this);
+ connect(colorDialog,SIGNAL(colorSelected(QColor)),this,SLOT(updateColor(QColor)));
+
+ QGroupBox *colorBox = new QGroupBox(tr("Background color"));
+ //backgroundColor->setMinimumWidth(100);
+ colorSelection->addWidget(backgroundColor);
+ colorSelection->addWidget(selectBackgroundColorButton = new QPushButton(tr("Choose")));
+ //colorSelection->addStretch();
+ connect(selectBackgroundColorButton, SIGNAL(clicked()), colorDialog, SLOT(show()));
+ colorBox->setLayout(colorSelection);
+
+ QHBoxLayout * buttons = new QHBoxLayout();
+ buttons->addStretch();
+ buttons->addWidget(new QLabel(tr("Restart is needed")));
+ buttons->addWidget(accept);
+ buttons->addWidget(cancel);
+
+ layout->addWidget(pathBox);
+ //layout->addLayout(path);
+ layout->addWidget(slideSizeBox);
+ //layout->addWidget(slideSize);
+ layout->addWidget(groupBox);
+ //layout->addWidget(fitToWidthRatioLabel);
+ layout->addWidget(fitBox);
+ layout->addWidget(colorBox);
+ //layout->addLayout(colorSelection);
+ layout->addLayout(buttons);
+
+
+ setLayout(layout);
+
+ restoreOptions(); //load options
+ resize(400,0);
+ setModal (true);
+ setWindowTitle("Options");
+}
+
+void OptionsDialog::findFolder()
+{
+ QString s = QFileDialog::getExistingDirectory(0,tr("Comics directory"),".");
+ if(!s.isEmpty())
+ {
+ pathEdit->setText(s);
+ }
+}
+
+void OptionsDialog::saveOptions()
+{
+ Configuration & conf = Configuration::getConfiguration();
+ conf.setDefaultPath(pathEdit->text());
+ conf.setGotoSlideSize(QSize(static_cast(slideSize->sliderPosition()*SLIDE_ASPECT_RATIO),slideSize->sliderPosition()));
+ if(radio1->isChecked())
+ conf.setFlowType(PictureFlow::CoverFlowLike);
+ if(radio2->isChecked())
+ conf.setFlowType(PictureFlow::Strip);
+ if(radio3->isChecked())
+ conf.setFlowType(PictureFlow::StripOverlapped);
+ conf.setFitToWidthRatio(fitToWidthRatioS->sliderPosition()/100.0);
+ conf.setBackgroundColor(colorDialog->currentColor());
+ conf.save();
+ close();
+ emit(accepted());
+}
+
+void OptionsDialog::restoreOptions()
+{
+ Configuration & conf = Configuration::getConfiguration();
+
+ slideSize->setSliderPosition(conf.getGotoSlideSize().height());
+ fitToWidthRatioS->setSliderPosition(conf.getFitToWidthRatio()*100);
+ pathEdit->setText(conf.getDefaultPath());
+ updateColor(Configuration::getConfiguration().getBackgroundColor());
+ switch(conf.getFlowType()){
+ case PictureFlow::CoverFlowLike:
+ radio1->setChecked(true);
+ break;
+ case PictureFlow::Strip:
+ radio2->setChecked(true);
+ break;
+ case PictureFlow::StripOverlapped:
+ radio3->setChecked(true);
+ break;
+ }
+}
+
+
+void OptionsDialog::updateColor(const QColor & color)
+{
+ QPalette pal = backgroundColor->palette();
+ pal.setColor(backgroundColor->backgroundRole(), color);
+ backgroundColor->setPalette(pal);
+ backgroundColor->setAutoFillBackground(true);
+ colorDialog->setCurrentColor(color);
+}
\ No newline at end of file
diff --git a/YACReader/options_dialog.h b/YACReader/options_dialog.h
new file mode 100644
index 00000000..11b92171
--- /dev/null
+++ b/YACReader/options_dialog.h
@@ -0,0 +1,57 @@
+#ifndef __OPTIONS_DIALOG_H
+#define __OPTIONS_DIALOG_H
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+class OptionsDialog : public QDialog
+{
+Q_OBJECT
+ public:
+ OptionsDialog(QWidget * parent = 0);
+ private:
+ //QLabel * pathLabel;
+ QLineEdit * pathEdit;
+ QPushButton * pathFindButton;
+
+ QLabel * magGlassSizeLabel;
+
+ QLabel * zoomLevel;
+
+ //QLabel * slideSizeLabel;
+ QSlider * slideSize;
+
+ QPushButton * accept;
+ QPushButton * cancel;
+
+ QRadioButton *radio1;
+ QRadioButton *radio2;
+ QRadioButton *radio3;
+
+ //QLabel * fitToWidthRatioLabel;
+ QSlider * fitToWidthRatioS;
+
+ QLabel * backgroundColor;
+ QPushButton * selectBackgroundColorButton;
+
+ QColorDialog * colorDialog;
+
+ public slots:
+ void saveOptions();
+ void restoreOptions();
+ void findFolder();
+ void updateColor(const QColor & color);
+
+signals:
+ void changedOptions();
+
+};
+
+
+#endif
diff --git a/YACReader/render.cpp b/YACReader/render.cpp
new file mode 100644
index 00000000..46fe60e2
--- /dev/null
+++ b/YACReader/render.cpp
@@ -0,0 +1,746 @@
+#include "render.h"
+#include
+#include
+#include
+#include
+#include
+
+#define NL 2
+#define NR 2
+
+QMutex mutex;
+
+//-----------------------------------------------------------------------------
+// MeanNoiseReductionFilter
+//-----------------------------------------------------------------------------
+
+MeanNoiseReductionFilter::MeanNoiseReductionFilter(enum NeighborghoodSize ns)
+:neighborghoodSize(ns)
+{
+
+}
+
+QImage MeanNoiseReductionFilter::setFilter(const QImage & image)
+{
+ int width = image.width();
+ int height = image.height();
+ QImage result(width,height,image.format());
+ int filterSize = sqrt((float)neighborghoodSize);
+ int bound = filterSize/2;
+ QRgb pix;
+ int r,g,b;
+ for(int j=bound;j redChannel;
+ QList greenChannel;
+ QList blueChannel;
+ for(int j=bound;j hist(256,0);
+
+ for(int j=0;j 1; i--)
+ {
+ new_count += hist[i];
+ percentage = new_count/count;
+ next_percentage = (new_count+hist[i-1])/count;
+ if(fabs (percentage - 0.006) < fabs (next_percentage - 0.006))
+ {
+ max = i-1;
+ break;
+ }
+ }
+ QColor c;
+ int range = max - min;
+ for(int j=0;j f)
+:QThread(),
+numPage(np),
+data(rd),
+page(p),
+degrees(d),
+filters(f)
+{
+}
+
+void PageRender::run()
+{
+ //QMutexLocker locker(&mutex);
+
+ QImage img;
+ img.loadFromData(data);
+ if(degrees > 0)
+ {
+ QMatrix m;
+ m.rotate(degrees);
+ img = img.transformed(m,Qt::SmoothTransformation);
+ }
+ for(int i=0;isetFilter(img);
+ }
+
+
+ *page = img;
+
+ emit pageReady(numPage);
+}
+
+//-----------------------------------------------------------------------------
+// DoublePageRender
+//-----------------------------------------------------------------------------
+
+DoublePageRender::DoublePageRender(int np, const QByteArray & rd, const QByteArray & rd2, QImage * p,unsigned int d, QVector f)
+:PageRender(),
+numPage(np),
+data(rd),
+data2(rd2),
+page(p),
+degrees(d),
+filters(f)
+{
+
+}
+
+void DoublePageRender::run()
+{
+ //QImage result;
+ //QMutexLocker locker(&mutex);
+ QImage img, img2;
+ if(!data.isEmpty())
+ img.loadFromData(data);
+ if(!data2.isEmpty())
+ img2.loadFromData(data2);
+ /*if(img.isNull())
+ img = QPixmap(img2.width(),img2.height());
+ if(img2.isNull())
+ img2 = QPixmap(img.width(),img.height());*/
+
+ int x,y;
+ x = img.width()+img2.width();
+ y = qMax(img.height(),img2.height());
+
+
+ QImage auxImg(x,y,QImage::Format_RGB32);
+ QPainter painter(&auxImg);
+ painter.drawImage(0,0,img);
+ painter.drawImage(img.width(),0,img2);
+ painter.end();
+
+ if(degrees > 0)
+ {
+ QMatrix m;
+ m.rotate(degrees);
+ auxImg = auxImg.transformed(m,Qt::SmoothTransformation);
+ }
+ for(int i=0;isetFilter(auxImg);
+ }
+
+ *page = auxImg;
+
+ emit pageReady(numPage);
+}
+
+//-----------------------------------------------------------------------------
+// Render
+//-----------------------------------------------------------------------------
+
+Render::Render()
+:currentIndex(0),doublePage(false),comic(0),loadedComic(false),imageRotation(0),numLeftPages(NL),numRightPages(NR)
+{
+ int size = numLeftPages+numRightPages+1;
+ currentPageBufferedIndex = numLeftPages;
+ for(int i = 0; iisNull())
+ {
+ if(pagesReady.size()>0)
+ {
+ if(doublePage)
+ {
+ if(pagesReady[currentIndex] && pagesReady[qMin(currentIndex+1,(int)comic->numPages()-1)])
+ if(currentIndex+1 > comic->numPages()-1)
+ pageRenders[currentPageBufferedIndex] = new DoublePageRender(currentIndex,comic->getRawData()->at(currentIndex),QByteArray(),buffer[currentPageBufferedIndex],imageRotation,filters);
+ else
+ pageRenders[currentPageBufferedIndex] = new DoublePageRender(currentIndex,comic->getRawData()->at(currentIndex),comic->getRawData()->at(currentIndex+1),buffer[currentPageBufferedIndex],imageRotation,filters);
+ else
+ //las pginas no estn listas, y se estn cargando en el cmic
+ emit processingPage(); //para evitar confusiones esta seal debera llamarse de otra forma
+ }
+ else
+ if(pagesReady[currentIndex])
+ pageRenders[currentPageBufferedIndex] = new PageRender(currentIndex,comic->getRawData()->at(currentIndex),buffer[currentPageBufferedIndex],imageRotation,filters);
+ else
+ //las pginas no estn listas, y se estn cargando en el cmic
+ emit processingPage(); //para evitar confusiones esta seal debera llamarse de otra forma
+
+ //si se ha creado un hilo para renderizar la pgina actual, se arranca
+ if(pageRenders[currentPageBufferedIndex]!=0)
+ {
+ //se conecta la seal pageReady del hilo, con el SLOT prepareAvailablePage
+ connect(pageRenders[currentPageBufferedIndex],SIGNAL(pageReady(int)),this,SLOT(prepareAvailablePage(int)));
+ //se emite la seal de procesando, debido a que los hilos se arrancan aqu
+ if(doublePage || filters.size()>0)
+ emit processingPage();
+ pageRenders[currentPageBufferedIndex]->start();
+ pageRenders[currentPageBufferedIndex]->setPriority(QThread::TimeCriticalPriority);
+ }
+ else
+ //en qu caso sera necesario hacer esto??? //TODO: IMPORTANTE, puede que no sea necesario.
+ emit processingPage();
+ }
+ else
+ //no hay ninguna pgina lista para ser renderizada, es necesario esperar.
+ emit processingPage();
+ }
+ else
+ // la pgina actual est lista
+ emit currentPageReady();
+
+ //se renderizan las pginas restantes para llenar el buffer.
+ if(doublePage)
+ fillBufferDoublePage();
+ else
+ fillBuffer();
+}
+
+QPixmap * Render::getCurrentPage()
+{
+ QPixmap * page = new QPixmap();
+ *page = page->fromImage(*buffer[currentPageBufferedIndex]);
+ return page;
+}
+
+void Render::setRotation(int degrees)
+{
+
+}
+
+void Render::setComic(Comic * c)
+{
+ if(comic !=0)
+ delete comic;
+ comic = c;
+}
+
+void Render::prepareAvailablePage(int page)
+{
+ if(currentIndex == page)
+ emit currentPageReady();
+}
+
+void Render::update()
+{
+ render();
+}
+//-----------------------------------------------------------------------------
+// Comic interface
+//-----------------------------------------------------------------------------
+void Render::load(const QString & path)
+{
+ if(comic!=0)
+ delete comic;
+ comic = new Comic();
+ previousIndex = currentIndex = 0;
+
+ connect(comic,SIGNAL(errorOpening()),this,SIGNAL(errorOpening()));
+ connect(comic,SIGNAL(imageLoaded(int)),this,SIGNAL(imageLoaded(int)));
+ connect(comic,SIGNAL(imageLoaded(int)),this,SLOT(pageRawDataReady(int)));
+ //connect(comic,SIGNAL(pageChanged(int)),this,SIGNAL(pageChanged(int)));
+ connect(comic,SIGNAL(numPages(unsigned int)),this,SIGNAL(numPages(unsigned int)));
+ connect(comic,SIGNAL(numPages(unsigned int)),this,SLOT(setNumPages(unsigned int)));
+ connect(comic,SIGNAL(imageLoaded(int,QByteArray)),this,SIGNAL(imageLoaded(int,QByteArray)));
+ connect(comic,SIGNAL(isBookmark(bool)),this,SIGNAL(currentPageIsBookmark(bool)));
+ connect(comic,SIGNAL(bookmarksLoaded(const Bookmarks &)),this,SIGNAL(bookmarksLoaded(const Bookmarks &)));
+ pagesReady.clear();
+ comic->load(path);
+ invalidate();
+ loadedComic = true; //TODO reset if an error occurs while opening
+}
+//si se solicita la siguiente pgina, se calcula cul debe ser en funcin de si se lee en modo a doble pgina o no.
+//la pgina slo se renderiza, si realmente ha cambiado.
+void Render::nextPage()
+{
+ int nextPage; //indica cul ser la prxima pgina
+ if(doublePage)
+ {
+ nextPage = currentIndex;
+ if(currentIndex+2numPages())
+ {
+ nextPage = currentIndex+2;
+ if(currentIndex != nextPage)
+ comic->setIndex(nextPage);
+ }
+ }
+ else
+ {
+ nextPage = comic->nextPage();
+ }
+
+ //se fuerza renderizado si la pgina ha cambiado
+ if(currentIndex != nextPage)
+ {
+ previousIndex = currentIndex;
+ currentIndex = nextPage;
+ update();
+ }
+}
+//si se solicita la pgina anterior, se calcula cul debe ser en funcin de si se lee en modo a doble pgina o no.
+//la pgina slo se renderiza, si realmente ha cambiado.
+void Render::previousPage()
+{
+ int previousPage; //indica cul ser la prxima pgina
+ if(doublePage)
+ {
+ if(currentIndex == 1)
+ invalidate();
+ previousPage = qMax(currentIndex-2,0);
+ if(currentIndex != previousPage)
+ {
+ comic->setIndex(previousPage);
+ }
+ }
+ else
+ {
+ previousPage = comic->previousPage();
+ }
+
+ //se fuerza renderizado si la pgina ha cambiado
+ if(currentIndex != previousPage)
+ {
+ previousIndex = currentIndex;
+ currentIndex = previousPage;
+ update();
+ }
+}
+unsigned int Render::getIndex()
+{
+ return comic->getIndex();
+}
+unsigned int Render::numPages()
+{
+ return comic->numPages();
+}
+
+bool Render::hasLoadedComic()
+{
+ if(comic!=0)
+ return comic->loaded();
+ return false;
+}
+
+void Render::setNumPages(unsigned int numPages)
+{
+ pagesReady.fill(false,numPages);
+}
+
+void Render::pageRawDataReady(int page)
+{
+ pagesEmited.push_back(page);
+ if(pageRenders.size()>0)
+ {
+ for(int i=0;i currentIndex-2*numLeftPages)) ||
+ ((pagesEmited.at(i) > currentIndex+1) && (pagesEmited.at(i) < currentIndex+1+2*numRightPages)) )
+ {
+ fillBufferDoublePage();
+ }
+ }
+ else
+ {
+ if ( ((pagesEmited.at(i) < currentIndex) && (pagesEmited.at(i) > currentIndex-numLeftPages)) ||
+ ((pagesEmited.at(i) > currentIndex) && (pagesEmited.at(i) < currentIndex+numRightPages)) )
+ {
+ fillBuffer();
+ }
+ }
+ }
+ pagesEmited.clear();
+ }
+}
+
+//slo se renderiza la pgina, si ha habido un cambio de pgina
+void Render::goTo(int index)
+{
+
+ if(currentIndex != index)
+ {
+ comic->setIndex(index);
+ previousIndex = currentIndex;
+ currentIndex = index;
+
+ //si cambia la paridad de las pgina en modo a doble pgina, se rellena el buffer.
+ //esto solo debera orcurrir al llegar al principio o al final
+ if(doublePage && ((previousIndex - index) % 2)!=0)
+ invalidate();
+
+ update();
+ }
+}
+
+void Render::rotateRight()
+{
+ imageRotation = (imageRotation+90) % 360;
+ invalidate();
+ update();
+}
+void Render::rotateLeft()
+{
+ if(imageRotation == 0)
+ imageRotation = 270;
+ else
+ imageRotation = imageRotation - 90;
+ invalidate();
+ update();
+}
+
+//Actualiza el buffer, aadiendo las imgenes (vacas) necesarias para su posterior renderizado y
+//eliminado aquellas que ya no sean necesarias. Tambin libera los hilos (no estoy seguro de que sea responsabilidad suya)
+//Calcula el nmero de nuevas pginas que hay que buferear y si debe hacerlo por la izquierda o la derecha (segn sea el sentido de la lectura)
+void Render::updateBuffer()
+{
+ //QMutexLocker locker(&mutex);
+ int windowSize = currentIndex - previousIndex;
+ if(doublePage)
+ {
+ windowSize = windowSize/2;
+ if(currentIndex == 0 && windowSize == 0 && previousIndex == 1)
+ windowSize = -1;
+
+ }
+ if(windowSize > 0)//add pages to right pages and remove on the left
+ {
+ windowSize = qMin(windowSize,buffer.size());
+ for(int i = 0; i < windowSize; i++)
+ {
+ //renders
+ PageRender * pr = pageRenders.front();
+ pageRenders.pop_front();
+ if(pr !=0)
+ {
+ if(pr->wait())
+ delete pr;
+ }
+ pageRenders.push_back(0);
+
+ //images
+
+ if(buffer.front()!=0)
+ delete buffer.front();
+ buffer.pop_front();
+ buffer.push_back(new QImage());
+ }
+ }
+ else //add pages to left pages and remove on the right
+ if(windowSize<0)
+ {
+ windowSize = -windowSize;
+ windowSize = qMin(windowSize,buffer.size());
+ for(int i = 0; i < windowSize; i++)
+ {
+ //renders
+ PageRender * pr = pageRenders.back();
+ pageRenders.pop_back();
+ if(pr !=0)
+ {
+ if(pr->wait())
+ delete pr;
+ }
+ pageRenders.push_front(0);
+
+ //images
+ buffer.push_front(new QImage());
+ QImage * p = buffer.back();
+ if(p!=0)
+ delete p;
+ buffer.pop_back();
+ }
+ }
+ previousIndex = currentIndex;
+}
+
+void Render::fillBuffer()
+{
+ for(int i = 1; i <= qMax(numLeftPages,numRightPages); i++)
+ {
+ if ((currentIndex+i < comic->numPages()) &&
+ buffer[currentPageBufferedIndex+i]->isNull() &&
+ i <= numRightPages &&
+ pageRenders[currentPageBufferedIndex+i]==0 &&
+ pagesReady[currentIndex+1]) //preload next pages
+ {
+ pageRenders[currentPageBufferedIndex+i] = new PageRender(currentIndex+i,comic->getRawData()->at(currentIndex+i),buffer[currentPageBufferedIndex+i],imageRotation);
+ connect(pageRenders[currentPageBufferedIndex],SIGNAL(pageReady(int)),this,SLOT(prepareAvailablePage(int)));
+ pageRenders[currentPageBufferedIndex+i]->start();
+ }
+
+ if ((currentIndex-i > 0) &&
+ buffer[currentPageBufferedIndex-i]->isNull() &&
+ i <= numLeftPages &&
+ pageRenders[currentPageBufferedIndex-i]==0 &&
+ pagesReady[currentIndex-1]) //preload previous pages
+ {
+ pageRenders[currentPageBufferedIndex-i] = new PageRender(currentIndex-i,comic->getRawData()->at(currentIndex-i),buffer[currentPageBufferedIndex-i],imageRotation);
+ connect(pageRenders[currentPageBufferedIndex],SIGNAL(pageReady(int)),this,SLOT(prepareAvailablePage(int)));
+ pageRenders[currentPageBufferedIndex-i]->start();
+ }
+ }
+}
+
+void Render::fillBufferDoublePage()
+{
+ for(int i = 1; i <= qMax(numLeftPages,numRightPages); i++)
+ {
+ if ((currentIndex+2*i < comic->numPages()) &&
+ buffer[currentPageBufferedIndex+i]->isNull() &&
+ i <= numRightPages &&
+ pageRenders[currentPageBufferedIndex+i]==0 &&
+ (pagesReady[currentIndex+2*i] && pagesReady[qMin(currentIndex+(2*i)+1,(int)comic->numPages()-1)])) //preload next pages
+ {
+ if(currentIndex+(2*i)+1 > comic->numPages()-1)
+ pageRenders[currentPageBufferedIndex+i] = new DoublePageRender(currentIndex+2*i,comic->getRawData()->at(currentIndex+(2*i)),QByteArray(),buffer[currentPageBufferedIndex+i],imageRotation);
+ else
+ pageRenders[currentPageBufferedIndex+i] = new DoublePageRender(currentIndex+2*i,comic->getRawData()->at(currentIndex+(2*i)),comic->getRawData()->at(currentIndex+(2*i)+1),buffer[currentPageBufferedIndex+i],imageRotation);
+ connect(pageRenders[currentPageBufferedIndex],SIGNAL(pageReady(int)),this,SLOT(prepareAvailablePage(int)));
+ pageRenders[currentPageBufferedIndex+i]->start();
+ }
+
+ if ((currentIndex-2*i >= -1) &&
+ buffer[currentPageBufferedIndex-i]->isNull() &&
+ i <= numLeftPages &&
+ pageRenders[currentPageBufferedIndex-i]==0 &&
+ (pagesReady[qMax(currentIndex-2*i,0)] && pagesReady[qMin(currentIndex-(2*i)+1,(int)comic->numPages()-1)])) //preload previous pages
+ {
+ if(currentIndex-2*i == -1)
+ pageRenders[currentPageBufferedIndex-i] = new DoublePageRender(0,QByteArray(),comic->getRawData()->at(0),buffer[currentPageBufferedIndex-i],imageRotation);
+ else
+ pageRenders[currentPageBufferedIndex-i] = new DoublePageRender(currentIndex-2*i,comic->getRawData()->at(currentIndex-(2*i)),comic->getRawData()->at(currentIndex-(2*i)+1),buffer[currentPageBufferedIndex-i],imageRotation);
+ connect(pageRenders[currentPageBufferedIndex],SIGNAL(pageReady(int)),this,SLOT(prepareAvailablePage(int)));
+ pageRenders[currentPageBufferedIndex-i]->start();
+ }
+ }
+}
+
+//Mtodo que debe ser llamado cada vez que la estructura del buffer se vuelve inconsistente con el modo de lectura actual.
+//se terminan todos los hilos en ejecucin y se libera la memoria (de hilos e imgenes)
+void Render::invalidate()
+{
+ for(int i=0;iterminate();
+ delete pageRenders[i];
+ pageRenders[i] = 0;
+ }
+ }
+
+ for(int i=0;inumPages()))
+ s += "-"+QString::number(currentIndex+2);
+ s += "/"+QString::number(comic->numPages());
+ return s;
+}
+
+void Render::setBookmark()
+{
+ comic->setBookmark();
+}
+
+void Render::removeBookmark()
+{
+ comic->removeBookmark();
+}
+
+void Render::save()
+{
+ comic->saveBookmarks();
+}
diff --git a/YACReader/render.h b/YACReader/render.h
new file mode 100644
index 00000000..d13d1fee
--- /dev/null
+++ b/YACReader/render.h
@@ -0,0 +1,177 @@
+ #ifndef RENDER_H
+#define RENDER_H
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include "comic.h"
+//-----------------------------------------------------------------------------
+// FILTERS
+//-----------------------------------------------------------------------------
+
+#include
+
+class Comic;
+
+class ImageFilter {
+public:
+ ImageFilter(){};
+ virtual QImage setFilter(const QImage & image) = 0;
+};
+
+class MeanNoiseReductionFilter : public ImageFilter {
+public:
+ enum NeighborghoodSize{SMALL=9, LARGE=25 };
+ MeanNoiseReductionFilter(enum NeighborghoodSize ns = SMALL);
+ virtual QImage setFilter(const QImage & image);
+private:
+ enum NeighborghoodSize neighborghoodSize;
+};
+
+class MedianNoiseReductionFilter : public ImageFilter {
+public:
+ enum NeighborghoodSize{SMALL=9, LARGE=25 };
+ MedianNoiseReductionFilter(enum NeighborghoodSize ns = SMALL);
+ virtual QImage setFilter(const QImage & image);
+private:
+ enum NeighborghoodSize neighborghoodSize;
+};
+
+class BrightnessFilter : public ImageFilter {
+public:
+ BrightnessFilter(int l=150);
+ virtual QImage setFilter(const QImage & image);
+private:
+ int level;
+};
+
+class ContrastFilter : public ImageFilter {
+public:
+ ContrastFilter();
+ virtual QImage setFilter(const QImage & image);
+private:
+ int level;
+};
+
+//-----------------------------------------------------------------------------
+// RENDER
+//-----------------------------------------------------------------------------
+
+class PageRender : public QThread
+{
+ Q_OBJECT
+public:
+ PageRender();
+ PageRender(int numPage, const QByteArray & rawData, QImage * page,unsigned int degrees=0, QVector filters = QVector());
+ int getNumPage(){return numPage;};
+ void setData(const QByteArray & rawData){data = rawData;};
+ void setPage(QImage * p){page = p;};
+ void setRotation(unsigned int d){degrees = d;};
+ void setFilters(QVector f){filters = f;};
+private:
+ int numPage;
+ QByteArray data;
+ QImage * page;
+ unsigned int degrees;
+ QVector filters;
+ void run();
+signals:
+ void pageReady(int);
+
+};
+//-----------------------------------------------------------------------------
+// RENDER
+//-----------------------------------------------------------------------------
+
+class DoublePageRender : public PageRender
+{
+ Q_OBJECT
+public:
+ DoublePageRender(int firstPage, const QByteArray & firstPageData,const QByteArray & secondPageData, QImage * page,unsigned int degrees=0, QVector filters = QVector());
+private:
+ int numPage;
+ QByteArray data;
+ QByteArray data2;
+ QImage * page;
+ unsigned int degrees;
+ QVector filters;
+ void run();
+signals:
+ void pageReady(int);
+
+};
+
+
+class Render : public QObject {
+Q_OBJECT
+public:
+ Render();
+
+public slots:
+ void render();
+ QPixmap * getCurrentPage();
+ void goTo(int index);
+ void doublePageSwitch();
+ void setRotation(int degrees);
+ void setComic(Comic * c);
+ void prepareAvailablePage(int page);
+ void update();
+ void setNumPages(unsigned int numPages);
+ void pageRawDataReady(int page);
+ //--comic interface
+ void nextPage();
+ void previousPage();
+ void load(const QString & path);
+ void rotateRight();
+ void rotateLeft();
+ unsigned int getIndex();
+ unsigned int numPages();
+ bool hasLoadedComic();
+ void updateBuffer();
+ void fillBuffer();
+ void fillBufferDoublePage();
+ void invalidate();
+ QString getCurrentPagesInformation();
+ void setBookmark();
+ void removeBookmark();
+ void save();
+
+signals:
+ void currentPageReady();
+ void processingPage();
+ void imagesLoaded();
+ void imageLoaded(int index);
+ void imageLoaded(int index,const QByteArray & image);
+ void pageChanged(int index);
+ void numPages(unsigned int numPages);
+ void errorOpening();
+ void currentPageIsBookmark(bool);
+ void bookmarksLoaded(const Bookmarks &);
+
+private:
+ Comic * comic;
+ bool doublePage;
+ int previousIndex;
+ int currentIndex;
+ //QPixmap * currentPage;
+ int currentPageBufferedIndex;
+ int numLeftPages;
+ int numRightPages;
+ QList pageRenders;
+ QList buffer;
+ void loadAll();
+ void updateRightPages();
+ void updateLeftPages();
+ bool loadedComic;
+ QList pagesEmited;
+ QVector pagesReady;
+ int imageRotation;
+ QVector filters;
+
+};
+
+
+#endif // RENDER_H
diff --git a/YACReader/shortcuts_dialog.cpp b/YACReader/shortcuts_dialog.cpp
new file mode 100644
index 00000000..cc40b1e4
--- /dev/null
+++ b/YACReader/shortcuts_dialog.cpp
@@ -0,0 +1,74 @@
+#include "shortcuts_dialog.h"
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+ShortcutsDialog::ShortcutsDialog(QWidget * parent)
+ :QDialog(parent)//,Qt::FramelessWindowHint)
+{
+ setModal(true);
+ setWindowIcon(QIcon(":/images/shortcuts.png"));
+ setWindowTitle(tr("YACReader keyboard shortcuts"));
+
+ QVBoxLayout * mainLayout = new QVBoxLayout;
+
+ close = new QPushButton(tr("Close"));
+ connect(close,SIGNAL(clicked()),this,SLOT(close()));
+
+ QHBoxLayout *bottomLayout = new QHBoxLayout;
+ bottomLayout->addStretch();
+ bottomLayout->addWidget(close);
+
+ QHBoxLayout * shortcutsLayout = new QHBoxLayout;
+
+ shortcuts = new QTextEdit();
+ QTextEdit * shortcuts2 = new QTextEdit();
+ shortcuts->setFrameStyle(QFrame::NoFrame);
+ shortcuts2->setFrameStyle(QFrame::NoFrame);
+ //"
General functions:
O : Open comic Esc : Exit
"
+ shortcuts->setReadOnly(true);
+ shortcuts2->setReadOnly(true);
+ shortcutsLayout->addWidget(shortcuts);
+ shortcutsLayout->addWidget(shortcuts2);
+ shortcutsLayout->setSpacing(0);
+ mainLayout->addLayout(shortcutsLayout);
+ mainLayout->addLayout(bottomLayout);
+
+ QHBoxLayout *imgMainLayout = new QHBoxLayout;
+ QLabel * imgLabel = new QLabel();
+ QPixmap p(":/images/shortcuts.png");
+ imgLabel->setPixmap(p);
+
+ QVBoxLayout * imgLayout = new QVBoxLayout;
+ imgLayout->addWidget(imgLabel);
+ imgLayout->addStretch();
+
+ imgMainLayout->addLayout(imgLayout);
+ imgMainLayout->addLayout(mainLayout);
+
+ setLayout(imgMainLayout);
+
+ setFixedSize(QSize(700,500));
+
+ QFile f(":/files/shortcuts.html");
+ f.open(QIODevice::ReadOnly);
+ QTextStream txtS(&f);
+ QString content = txtS.readAll();
+ f.close();
+
+ shortcuts->setHtml(content);
+
+ QFile f2(":/files/shortcuts2.html");
+ f2.open(QIODevice::ReadOnly);
+ QTextStream txtS2(&f2);
+ content = txtS2.readAll();
+ f2.close();
+
+ shortcuts2->setHtml(content);
+
+ setWindowTitle(tr("Keyboard Shortcuts"));
+}
diff --git a/YACReader/shortcuts_dialog.h b/YACReader/shortcuts_dialog.h
new file mode 100644
index 00000000..8f1b66b6
--- /dev/null
+++ b/YACReader/shortcuts_dialog.h
@@ -0,0 +1,19 @@
+#ifndef SHORTCUTS_DIALOG_H
+#define SHORTCUTS_DIALOG_H
+
+#include
+#include
+#include
+
+class ShortcutsDialog : public QDialog
+{
+Q_OBJECT
+ public:
+ ShortcutsDialog(QWidget * parent = 0);
+ private:
+ QTextEdit * shortcuts;
+ QPushButton * close;
+ public slots:
+};
+
+#endif // SHORTCUTS_DIALOG_H
diff --git a/YACReader/translator.cpp b/YACReader/translator.cpp
new file mode 100644
index 00000000..fce5832d
--- /dev/null
+++ b/YACReader/translator.cpp
@@ -0,0 +1,88 @@
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "translator.h"
+
+YACReaderTranslator::YACReaderTranslator(QWidget * parent)
+:QWidget(parent)
+{
+ this->setCursor(QCursor(Qt::ArrowCursor));
+ this->setAutoFillBackground(true);
+ this->setBackgroundRole(QPalette::Window);
+ QPalette p(this->palette());
+ p.setColor(QPalette::Window, QColor(96,96,96));
+ this->setPalette(p);
+
+ QVBoxLayout *layout = new QVBoxLayout(this);
+ QWebView * view = new QWebView();
+ QFile f(":/files/translator.html");
+ f.open(QIODevice::ReadOnly);
+ QTextStream txtS(&f);
+ QString contentHTML = txtS.readAll();
+ view->setHtml(contentHTML);
+ view->page()->setLinkDelegationPolicy(QWebPage::DelegateExternalLinks);
+ connect(view->page(),SIGNAL(linkClicked(QUrl)),this,SLOT(play(QUrl)));
+
+ QHBoxLayout * buttonBar = new QHBoxLayout();
+ QPushButton * close = new QPushButton(QIcon(QPixmap(":/images/close.png")),"");
+ close->setFlat(true);
+ buttonBar->addStretch();
+ close->resize(18,18);
+ buttonBar->addWidget(close);
+ buttonBar->setMargin(0);
+ connect(close,SIGNAL(clicked()),this->parent(),SLOT(animateHideTranslator()));
+
+ layout->setMargin(0);
+ layout->setSpacing(0);
+
+ layout->addLayout(buttonBar);
+ layout->addWidget(view);
+
+ resize(view->size().width()/1.60,view->size().height());
+
+ music = createPlayer(MusicCategory);
+
+ show();
+}
+
+void YACReaderTranslator::play(const QUrl & url)
+{
+ MediaSource src(url);
+ src.setAutoDelete(true);
+ music->setCurrentSource(src);
+ music->play();
+}
+
+YACReaderTranslator::~YACReaderTranslator()
+{
+ delete music;
+}
+
+void YACReaderTranslator::mousePressEvent(QMouseEvent *event)
+{
+ drag = true;
+ click = event->pos();
+}
+
+void YACReaderTranslator::mouseReleaseEvent(QMouseEvent *event)
+{
+ drag = false;
+}
+
+void YACReaderTranslator::mouseMoveEvent(QMouseEvent * event)
+{
+ if(drag)
+ this->move(QPoint(mapToParent(event->pos())-click));
+
+}
+
diff --git a/YACReader/translator.h b/YACReader/translator.h
new file mode 100644
index 00000000..759ce22c
--- /dev/null
+++ b/YACReader/translator.h
@@ -0,0 +1,32 @@
+#ifndef __TRANSLATOR_H
+#define __TRANSLATOR_H
+
+class QUrl;
+class QMouseEvent;
+class QPoint;
+#include
+#include
+
+using namespace Phonon;
+
+class YACReaderTranslator : public QWidget
+{
+ Q_OBJECT
+ public:
+ YACReaderTranslator(QWidget * parent = 0);
+ ~YACReaderTranslator();
+
+ public slots:
+ void play(const QUrl & url);
+
+protected:
+ void mousePressEvent(QMouseEvent *event);
+ void mouseReleaseEvent(QMouseEvent *event);
+ void mouseMoveEvent ( QMouseEvent * event );
+ bool drag;
+ QPoint click;
+private:
+ MediaObject * music;
+};
+
+#endif
\ No newline at end of file
diff --git a/YACReader/viewer.cpp b/YACReader/viewer.cpp
new file mode 100644
index 00000000..a107d394
--- /dev/null
+++ b/YACReader/viewer.cpp
@@ -0,0 +1,671 @@
+#include "viewer.h"
+#include "magnifying_glass.h"
+#include "configuration.h"
+#include "magnifying_glass.h"
+#include "goto_flow.h"
+#include "bookmarks_dialog.h"
+#include "render.h"
+#include "goto_dialog.h"
+#include "translator.h"
+
+#include
+#include
+#define STEPS 22
+
+
+
+Viewer::Viewer(QWidget * parent)
+:QScrollArea(parent),
+currentPage(0),
+magnifyingGlassShowed(false),
+fullscreen(false),
+information(false),
+adjustToWidthRatio(1),
+doublePage(false),
+wheelStop(false),
+direction(1),
+restoreMagnifyingGlass(false),
+drag(false)
+
+{
+ translator = new YACReaderTranslator(this);
+ translator->hide();
+ translatorAnimation = new QPropertyAnimation(translator,"pos");
+ translatorAnimation->setDuration(150);
+ translatorXPos = -10000;
+ translator->move(-translator->width(),10);
+ //current comic page
+ content = new QLabel(this);
+ configureContent(tr("Press 'O' to open comic."));
+ //scroll area configuration
+ setBackgroundRole(QPalette::Dark);
+ setWidget(content);
+ setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ setFrameStyle(QFrame::NoFrame);
+ setAlignment(Qt::AlignCenter);
+
+ QPalette palette;
+ palette.setColor(backgroundRole(), Configuration::getConfiguration().getBackgroundColor());
+ setPalette(palette);
+ //---------------------------------------
+ mglass = new MagnifyingGlass(Configuration::getConfiguration().getMagnifyingGlassSize(),this);
+ mglass->hide();
+ content->setMouseTracking(true);
+ setMouseTracking(true);
+
+ informationLabel = new QLabel(this);
+ informationLabel->setAlignment(Qt::AlignVCenter|Qt::AlignHCenter);
+ informationLabel->setAutoFillBackground(true);
+ informationLabel->setFont(QFont("courier new", 12));
+ informationLabel->hide();
+ informationLabel->resize(100,25);
+
+ showCursor();
+
+ goToDialog = new GoToDialog(this);
+
+ goToFlow = new GoToFlow(this,Configuration::getConfiguration().getFlowType());
+ goToFlow->hide();
+ showGoToFlowAnimation = new QPropertyAnimation(goToFlow,"pos");
+ showGoToFlowAnimation->setDuration(150);
+
+ bd = new BookmarksDialog(this->parentWidget());
+
+ render = new Render();
+
+ scroller = new QTimer(this);
+
+ hideCursorTimer = new QTimer();
+ hideCursorTimer->setSingleShot(true);
+
+ if(Configuration::getConfiguration().getDoublePage())
+ doublePageSwitch();
+
+ createConnections();
+
+ hideCursorTimer->start(2500);
+
+ setMouseTracking(true);
+}
+
+void Viewer::createConnections()
+{
+ //magnifyingGlass (update mg after a background change
+ connect(this,SIGNAL(backgroundChanges()),mglass,SLOT(updateImage()));
+
+ //goToDialog
+ connect(goToDialog,SIGNAL(goToPage(unsigned int)),this,SLOT(goTo(unsigned int)));
+
+ //goToFlow goTo
+ connect(goToFlow,SIGNAL(goToPage(unsigned int)),this,SLOT(goTo(unsigned int)));
+
+ //current time
+ QTimer * t = new QTimer();
+ connect(t,SIGNAL(timeout()),this,SLOT(updateInformation()));
+ t->start(1000);
+
+ //hide cursor
+ connect(hideCursorTimer,SIGNAL(timeout()),this,SLOT(hideCursor()));
+
+ //bookmarks
+ connect(bd,SIGNAL(goToPage(unsigned int)),this,SLOT(goTo(unsigned int)));
+
+ //render
+ connect(render,SIGNAL(errorOpening()),this,SLOT(resetContent()));
+ connect(render,SIGNAL(numPages(unsigned int)),goToFlow,SLOT(setNumSlides(unsigned int)));
+ connect(render,SIGNAL(numPages(unsigned int)),goToDialog,SLOT(setNumPages(unsigned int)));
+ connect(render,SIGNAL(imageLoaded(int,QByteArray)),goToFlow,SLOT(setImageReady(int,QByteArray)));
+ connect(render,SIGNAL(currentPageReady()),this,SLOT(updatePage()));
+ connect(render,SIGNAL(processingPage()),this,SLOT(setLoadingMessage()));
+ connect(render,SIGNAL(currentPageIsBookmark(bool)),this,SIGNAL(pageIsBookmark(bool)));
+ connect(render,SIGNAL(bookmarksLoaded(const Bookmarks &)),bd,SLOT(setBookmarks(const Bookmarks &)));
+}
+
+void Viewer::open(QString pathFile)
+{
+ if(render->hasLoadedComic())
+ save();
+ //bd->setBookmarks(*bm);
+
+ goToFlow->reset();
+ render->load(pathFile);
+ render->update();
+
+ verticalScrollBar()->setSliderPosition(verticalScrollBar()->minimum());
+}
+
+void Viewer::next()
+{
+ direction = 1;
+ render->nextPage();
+}
+
+void Viewer::prev()
+{
+ direction = -1;
+ render->previousPage();
+}
+void Viewer::showGoToDialog()
+{
+ goToDialog->show();
+}
+void Viewer::goTo(unsigned int page)
+{
+ direction = 1; //in "go to" direction is always fordward
+ render->goTo(page-1);
+}
+
+void Viewer::updatePage()
+{
+ QPixmap * previousPage = currentPage;
+ currentPage = render->getCurrentPage();
+ content->setPixmap(*currentPage);
+ updateContentSize();
+ updateVerticalScrollBar();
+ emit backgroundChanges();
+ emit(pageAvailable(true));
+ //TODO -> update bookmark action
+ setFocus(Qt::ShortcutFocusReason);
+ delete previousPage;
+ if(restoreMagnifyingGlass)
+ {
+ restoreMagnifyingGlass = false;
+ showMagnifyingGlass();
+ }
+
+}
+
+void Viewer::updateContentSize()
+{
+ //there is an image to resize
+ if(currentPage !=0 && !currentPage->isNull())
+ {
+ if(Configuration::getConfiguration().getAdjustToFullSize())
+ {
+ content->resize(currentPage->width(),currentPage->height());
+ }
+ else
+ {
+ float aspectRatio = (float)currentPage->width()/currentPage->height();
+ //Fit to width
+ if(Configuration::getConfiguration().getAdjustToWidth())
+ {
+ adjustToWidthRatio = Configuration::getConfiguration().getFitToWidthRatio();
+ if(static_cast(width()*adjustToWidthRatio/aspectRatio)(height()*aspectRatio)>width())
+ content->resize(width(),static_cast(width()/aspectRatio));
+ else
+ content->resize(static_cast(height()*aspectRatio),height());
+ else
+ content->resize(width()*adjustToWidthRatio,static_cast(width()*adjustToWidthRatio/aspectRatio));
+ }
+ //Fit to height or fullsize/custom size
+ else
+ {
+ if(static_cast(height()*aspectRatio)>width()) //page width exceeds window width
+ content->resize(width(),static_cast(width()/aspectRatio));
+ else
+ content->resize(static_cast(height()*aspectRatio),height());
+ }
+ }
+ emit backgroundChanges();
+ }
+ content->update(); //TODO, it shouldn't be neccesary
+}
+
+void Viewer::updateVerticalScrollBar()
+{
+ if(direction > 0)
+ verticalScrollBar()->setSliderPosition(verticalScrollBar()->minimum());
+ else
+ verticalScrollBar()->setSliderPosition(verticalScrollBar()->maximum());
+}
+
+void Viewer::scrollDown()
+{
+ if(verticalScrollBar()->sliderPosition()==verticalScrollBar()->maximum())
+ {
+ next();
+ scroller->stop();
+ }
+ else
+ {
+ int currentPos = verticalScrollBar()->sliderPosition();
+ verticalScrollBar()->setSliderPosition(currentPos=currentPos+posByStep);
+ if((verticalScrollBar()->sliderPosition()==verticalScrollBar()->maximum())
+ ||(verticalScrollBar()->sliderPosition()>=nextPos))
+ scroller->stop();
+ emit backgroundChanges();
+ }
+}
+
+void Viewer::scrollUp()
+{
+ if(verticalScrollBar()->sliderPosition()==verticalScrollBar()->minimum())
+ {
+ prev();
+ scroller->stop();
+ }
+ else
+ {
+ int currentPos = verticalScrollBar()->sliderPosition();
+ verticalScrollBar()->setSliderPosition(currentPos=currentPos-posByStep);
+ if((verticalScrollBar()->sliderPosition()==verticalScrollBar()->minimum())
+ ||(verticalScrollBar()->sliderPosition()<=nextPos))
+ scroller->stop();
+ emit backgroundChanges();
+ }
+}
+
+void Viewer::keyPressEvent(QKeyEvent *event)
+{
+ if(render->hasLoadedComic())
+ {
+ if(goToFlow->isVisible() && event->key()!=Qt::Key_S)
+ QCoreApplication::sendEvent(goToFlow,event);
+ else
+ switch (event->key())
+ {
+ case Qt::Key_Space:
+ disconnect(scroller,SIGNAL(timeout()),this,0);
+ connect(scroller,SIGNAL(timeout()),this,SLOT(scrollDown()));
+ posByStep = height()/STEPS;
+ nextPos=verticalScrollBar()->sliderPosition()+static_cast((height()*0.80));
+ scroller->start(20);
+ break;
+ case Qt::Key_B:
+ disconnect(scroller,SIGNAL(timeout()),this,0);
+ connect(scroller,SIGNAL(timeout()),this,SLOT(scrollUp()));
+ posByStep = height()/STEPS;
+ nextPos=verticalScrollBar()->sliderPosition()-static_cast((height()*0.80));
+ scroller->start(20);
+ break;
+ case Qt::Key_S:
+ goToFlowSwitch();
+ break;
+ case Qt::Key_T:
+ translatorSwitch();
+ break;
+ case Qt::Key_Down:
+ /*if(verticalScrollBar()->sliderPosition()==verticalScrollBar()->maximum())
+ next();
+ else*/
+ QAbstractScrollArea::keyPressEvent(event);
+ emit backgroundChanges();
+ break;
+ case Qt::Key_Up:
+ /*if(verticalScrollBar()->sliderPosition()==verticalScrollBar()->minimum())
+ prev();
+ else*/
+ QAbstractScrollArea::keyPressEvent(event);
+ emit backgroundChanges();
+ break;
+ case Qt::Key_Home:
+ goTo(1);
+ break;
+ case Qt::Key_End:
+ goTo(this->render->numPages());
+ break;
+ default:
+ QAbstractScrollArea::keyPressEvent(event);
+ break;
+ }
+ if(mglass->isVisible())
+ switch(event->key())
+ {
+ case Qt::Key_Plus: case Qt::Key_Minus: case Qt::Key_Underscore: case Qt::Key_Asterisk:
+ QCoreApplication::sendEvent(mglass,event);
+ }
+ }
+}
+
+void Viewer::wheelEvent(QWheelEvent * event)
+{
+ if(render->hasLoadedComic())
+ {
+ if((event->delta()<0)&&(verticalScrollBar()->sliderPosition()==verticalScrollBar()->maximum()))
+ {
+ if(wheelStop)
+ {
+ next();
+ event->accept();
+ wheelStop = false;
+ return;
+ }
+ else
+ wheelStop = true;
+ }
+ else
+ if((event->delta()>0)&&(verticalScrollBar()->sliderPosition()==verticalScrollBar()->minimum()))
+ {
+ if(wheelStop)
+ {
+ prev();
+ event->accept();
+ wheelStop = false;
+ return;
+ }
+ else
+ wheelStop = true;
+ }
+
+ QAbstractScrollArea::wheelEvent(event);
+ emit backgroundChanges();
+ }
+}
+
+void Viewer::resizeEvent(QResizeEvent * event)
+{
+ updateContentSize();
+ goToFlow->move(QPoint((width()-goToFlow->width())/2,height()-goToFlow->height()));
+ informationLabel->move(QPoint((width()-informationLabel->width())/2,0));
+ QScrollArea::resizeEvent(event);
+}
+
+void Viewer::mouseMoveEvent(QMouseEvent * event)
+{
+ showCursor();
+ hideCursorTimer->start(2500);
+
+ if(magnifyingGlassShowed)
+ mglass->move(static_cast(event->x()-float(mglass->width())/2),static_cast(event->y()-float(mglass->height())/2));
+
+ if(render->hasLoadedComic())
+ {
+ if(showGoToFlowAnimation->state()!=QPropertyAnimation::Running)
+ {
+ if(goToFlow->isVisible())
+ {
+ animateHideGoToFlow();
+ //goToFlow->hide();
+ }
+ else
+ {
+ int umbral = (width()-goToFlow->width())/2;
+ if((event->y()>height()-15)&&(event->x()>umbral)&&(event->x()stop();
+ }
+ }
+ }
+
+ if(drag)
+ {
+ int currentPosY = verticalScrollBar()->sliderPosition();
+ int currentPosX = horizontalScrollBar()->sliderPosition();
+ verticalScrollBar()->setSliderPosition(currentPosY=currentPosY+(yDragOrigin-event->y()));
+ horizontalScrollBar()->setSliderPosition(currentPosX=currentPosX+(xDragOrigin-event->x()));
+ yDragOrigin = event->y();
+ xDragOrigin = event->x();
+ }
+ }
+
+
+}
+
+const QPixmap * Viewer::pixmap()
+{
+ return content->pixmap();
+}
+
+void Viewer::magnifyingGlassSwitch()
+{
+ magnifyingGlassShowed?hideMagnifyingGlass():showMagnifyingGlass();
+}
+
+void Viewer::showMagnifyingGlass()
+{
+ if(render->hasLoadedComic())
+ {
+ QPoint p = QPoint(cursor().pos().x(),cursor().pos().y());
+ p = this->parentWidget()->mapFromGlobal(p);
+ mglass->move(static_cast(p.x()-float(mglass->width())/2)
+ ,static_cast(p.y()-float(mglass->height())/2));
+ mglass->show();
+ mglass->updateImage(mglass->x()+mglass->width()/2,mglass->y()+mglass->height()/2);
+ magnifyingGlassShowed = true;
+ }
+}
+
+void Viewer::hideMagnifyingGlass()
+{
+ mglass->hide();
+ magnifyingGlassShowed = false;
+}
+
+void Viewer::informationSwitch()
+{
+ information?informationLabel->hide():informationLabel->show();
+ informationLabel->move(QPoint((width()-informationLabel->width())/2,0));
+ information=!information;
+ //TODO it shouldn't be neccesary
+ informationLabel->adjustSize();
+ informationLabel->update();
+}
+
+void Viewer::updateInformation()
+{
+ if(render->hasLoadedComic())
+ {
+ informationLabel->setText(render->getCurrentPagesInformation()+" - "+QTime::currentTime().toString("HH:mm"));
+ informationLabel->adjustSize();
+ informationLabel->update(); //TODO it shouldn't be neccesary
+ }
+}
+
+void Viewer::goToFlowSwitch()
+{
+ goToFlow->isVisible()?animateHideGoToFlow():showGoToFlow();
+}
+
+void Viewer::translatorSwitch()
+{
+ translator->isVisible()?animateHideTranslator():animateShowTranslator();
+}
+
+void Viewer::showGoToFlow()
+{
+ if(render->hasLoadedComic())
+ {
+ animateShowGoToFlow();
+ }
+}
+
+void Viewer::animateShowGoToFlow()
+{
+ if(goToFlow->isHidden() && showGoToFlowAnimation->state()!=QPropertyAnimation::Running)
+ {
+ disconnect(showGoToFlowAnimation,SIGNAL(finished()),goToFlow,SLOT(hide()));
+ connect(showGoToFlowAnimation,SIGNAL(finished()),this,SLOT(moveCursoToGoToFlow()));
+ showGoToFlowAnimation->setStartValue(QPoint((width()-goToFlow->width())/2,height()-10));
+ showGoToFlowAnimation->setEndValue(QPoint((width()-goToFlow->width())/2,height()-goToFlow->height()));
+ showGoToFlowAnimation->start();
+ goToFlow->centerSlide(render->getIndex());
+ goToFlow->setPageNumber(render->getIndex());
+ goToFlow->show();
+ goToFlow->setFocus(Qt::OtherFocusReason);
+ }
+}
+
+void Viewer::animateHideGoToFlow()
+{
+ if(goToFlow->isVisible() && showGoToFlowAnimation->state()!=QPropertyAnimation::Running)
+ {
+ connect(showGoToFlowAnimation,SIGNAL(finished()),goToFlow,SLOT(hide()));
+ disconnect(showGoToFlowAnimation,SIGNAL(finished()),this,SLOT(moveCursoToGoToFlow()));
+ showGoToFlowAnimation->setStartValue(QPoint((width()-goToFlow->width())/2,height()-goToFlow->height()));
+ showGoToFlowAnimation->setEndValue(QPoint((width()-goToFlow->width())/2,height()));
+ showGoToFlowAnimation->start();
+ goToFlow->centerSlide(render->getIndex());
+ goToFlow->setPageNumber(render->getIndex());
+ this->setFocus(Qt::OtherFocusReason);
+ }
+}
+
+void Viewer::moveCursoToGoToFlow()
+{
+ //Move cursor to goToFlow widget on show (this avoid hide when mouse is moved)
+ int y = goToFlow->pos().y();
+ int x1 = goToFlow->pos().x();
+ int x2 = x1 + goToFlow->width();
+ QPoint cursorPos = mapFromGlobal(cursor().pos());
+ int cursorX = cursorPos.x();
+ int cursorY = cursorPos.y();
+
+ if(cursorY <= y)
+ cursorY = y + 10;
+ if(cursorX <= x1)
+ cursorX = x1 + 10;
+ if(cursorX >= x2)
+ cursorX = x2 - 10;
+ cursor().setPos(mapToGlobal(QPoint(cursorX,cursorY)));
+ hideCursorTimer->stop();
+ showCursor();
+}
+
+void Viewer::rotateLeft()
+{
+ render->rotateLeft();
+}
+void Viewer::rotateRight()
+{
+ render->rotateRight();
+}
+
+//TODO
+void Viewer::setBookmark(bool set)
+{
+ render->setBookmark();
+ if(set) //add bookmark
+ {
+ render->setBookmark();
+ }
+ else //remove bookmark
+ {
+ render->removeBookmark();
+ }
+}
+
+void Viewer::save ()
+{
+ if(render->hasLoadedComic())
+ render->save();
+}
+
+void Viewer::doublePageSwitch()
+{
+ doublePage = !doublePage;
+ render->doublePageSwitch();
+ Configuration::getConfiguration().setDoublePage(doublePage);
+}
+
+void Viewer::resetContent()
+{
+ configureContent(tr("Press 'O' to open comic."));
+ goToFlow->reset();
+ emit reset();
+}
+
+void Viewer::setLoadingMessage()
+{
+ if(magnifyingGlassShowed)
+ {
+ hideMagnifyingGlass();
+ restoreMagnifyingGlass = true;
+ }
+ emit(pageAvailable(false));
+ configureContent(tr("Loading...please wait!"));
+}
+
+void Viewer::configureContent(QString msg)
+{
+ content->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored);
+ content->setScaledContents(true);
+ content->setAlignment(Qt::AlignTop|Qt::AlignHCenter);
+ content->setText(msg);
+ content->setFont(QFont("courier new", 12));
+ content->adjustSize();
+ setFocus(Qt::ShortcutFocusReason);
+ //emit showingText();
+}
+
+void Viewer::hideCursor()
+{
+ setCursor(Qt::BlankCursor);
+}
+void Viewer::showCursor()
+{
+ if(drag)
+ setCursor(Qt::ClosedHandCursor);
+ else
+ setCursor(Qt::OpenHandCursor);
+}
+
+void Viewer::updateOptions()
+{
+
+ goToFlow->setFlowType(Configuration::getConfiguration().getFlowType());
+ updateBackgroundColor(Configuration::getConfiguration().getBackgroundColor());
+ updateContentSize();
+ //goToFlow->updateSize();
+}
+
+void Viewer::updateBackgroundColor(const QColor & color)
+{
+ QPalette palette;
+ palette.setColor(backgroundRole(), color);
+ setPalette(palette);
+}
+
+void Viewer::animateShowTranslator()
+{
+ if(translator->isHidden() && translatorAnimation->state()!=QPropertyAnimation::Running)
+ {
+ disconnect(translatorAnimation,SIGNAL(finished()),translator,SLOT(hide()));
+ if(translatorXPos == -10000)
+ translatorXPos = (width()-translator->width())/2;
+ int x = qMax(0,qMin(translatorXPos,width()-translator->width()));
+ if(translator->pos().x()<0)
+ {
+ translatorAnimation->setStartValue(QPoint(-translator->width(),translator->pos().y()));
+ }
+ else
+ {
+ translatorAnimation->setStartValue(QPoint(width()+translator->width(),translator->pos().y()));
+ }
+ translatorAnimation->setEndValue(QPoint(x,translator->pos().y()));
+ translatorAnimation->start();
+ translator->show();
+ translator->setFocus(Qt::OtherFocusReason);
+ }
+}
+void Viewer::animateHideTranslator()
+{
+ if(translator->isVisible() && translatorAnimation->state()!=QPropertyAnimation::Running)
+ {
+ connect(translatorAnimation,SIGNAL(finished()),translator,SLOT(hide()));
+ translatorAnimation->setStartValue(QPoint(translatorXPos = translator->pos().x(),translator->pos().y()));
+ if((translator->width()/2)+translator->pos().x() <= width()/2)
+ translatorAnimation->setEndValue(QPoint(-translator->width(),translator->pos().y()));
+ else
+ translatorAnimation->setEndValue(QPoint(width()+translator->width(),translator->pos().y()));
+ translatorAnimation->start();
+ this->setFocus(Qt::OtherFocusReason);
+ }
+}
+
+void Viewer::mousePressEvent ( QMouseEvent * event )
+{
+ drag = true;
+ yDragOrigin = event->y();
+ xDragOrigin = event->x();
+ setCursor(Qt::ClosedHandCursor);
+}
+void Viewer::mouseReleaseEvent ( QMouseEvent * event )
+{
+ drag = false;
+ setCursor(Qt::OpenHandCursor);
+}
\ No newline at end of file
diff --git a/YACReader/viewer.h b/YACReader/viewer.h
new file mode 100644
index 00000000..6da04035
--- /dev/null
+++ b/YACReader/viewer.h
@@ -0,0 +1,131 @@
+#ifndef __VIEWER_H
+#define __VIEWER_H
+
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+
+
+class Comic;
+class MagnifyingGlass;
+class GoToFlow;
+class BookmarksDialog;
+class Render;
+class GoToDialog;
+class YACReaderTranslator;
+
+ class Viewer : public QScrollArea
+ {
+ Q_OBJECT
+ public:
+ bool fullscreen; //TODO, change by the right use of windowState();
+ public slots:
+ void open(QString pathFile);
+ void prev();
+ void next();
+ void showGoToDialog();
+ void goTo(unsigned int page);
+ void updatePage();
+ void updateContentSize();
+ void updateVerticalScrollBar();
+ void updateOptions();
+ void scrollDown();
+ void scrollUp();
+ void magnifyingGlassSwitch();
+ void showMagnifyingGlass();
+ void hideMagnifyingGlass();
+ void informationSwitch();
+ void updateInformation();
+ void goToFlowSwitch();
+ void showGoToFlow();
+ void moveCursoToGoToFlow();
+ void animateShowGoToFlow();
+ void animateHideGoToFlow();
+ void rotateLeft();
+ void rotateRight();
+ bool magnifyingGlassIsVisible() {return magnifyingGlassShowed;}
+ void setBookmark(bool);
+ void save();
+ void doublePageSwitch();
+ void resetContent();
+ void setLoadingMessage();
+ void configureContent(QString msg);
+ void hideCursor();
+ void showCursor();
+ void createConnections();
+ void translatorSwitch();
+ void animateShowTranslator();
+ void animateHideTranslator();
+virtual void mousePressEvent ( QMouseEvent * event );
+virtual void mouseReleaseEvent ( QMouseEvent * event );
+ void updateBackgroundColor(const QColor & color);
+
+ private:
+ bool information;
+ bool doublePage;
+ QLabel * informationLabel;
+ QTimer * scroller;
+ int posByStep;
+ int nextPos;
+ GoToFlow * goToFlow;
+ QPropertyAnimation * showGoToFlowAnimation;
+ GoToDialog * goToDialog;
+ //!Image properties
+ float adjustToWidthRatio;
+ //! Comic
+ //Comic * comic;
+ int index;
+ QPixmap *currentPage;
+ BookmarksDialog * bd;
+ bool wheelStop;
+ Render * render;
+ QTimer * hideCursorTimer;
+ int direction;
+ bool drag;
+
+ //!Widgets
+ QLabel *content;
+
+ YACReaderTranslator * translator;
+ int translatorXPos;
+ QPropertyAnimation * translatorAnimation;
+
+ int yDragOrigin;
+ int xDragOrigin;
+ private:
+ //!Magnifying glass
+ MagnifyingGlass *mglass;
+ bool magnifyingGlassShowed;
+ bool restoreMagnifyingGlass;
+
+ //! Manejadores de evento:
+ void keyPressEvent(QKeyEvent * event);
+ void resizeEvent(QResizeEvent * event);
+ void wheelEvent(QWheelEvent * event);
+ void mouseMoveEvent(QMouseEvent * event);
+
+ public:
+ Viewer(QWidget * parent = 0);
+ void toggleFullScreen();
+ const QPixmap * pixmap();
+ //Comic * getComic(){return comic;}
+ const BookmarksDialog * getBookmarksDialog(){return bd;}
+ signals:
+ void backgroundChanges();
+ void pageAvailable(bool);
+ void pageIsBookmark(bool);
+ void reset();
+ };
+
+#endif
diff --git a/YACReader/yacreader_es.qm b/YACReader/yacreader_es.qm
new file mode 100644
index 00000000..acfc1ae4
Binary files /dev/null and b/YACReader/yacreader_es.qm differ
diff --git a/YACReader/yacreader_es.ts b/YACReader/yacreader_es.ts
new file mode 100644
index 00000000..fc3f0de0
--- /dev/null
+++ b/YACReader/yacreader_es.ts
@@ -0,0 +1,569 @@
+
+
+
+
+ BookmarksDialog
+
+
+ Lastest Page
+ Última página
+
+
+
+ Close
+ Cerrar
+
+
+
+ Click on any image to go to the bookmark
+ Pulsa en cualquier imagen para ir al marcador
+
+
+
+
+ Loading...
+ Cargando...
+
+
+
+ Comic
+
+
+ No images found
+ No se han encontrado imágenes
+
+
+
+ There are not images on the selected folder
+ No hay imágenes en el directorio seleccionado
+
+
+
+ File error
+ Error en archivo
+
+
+
+ File not found or not images in file
+ Archivo no encontrado o no hay imágenes en él
+
+
+
+ 7z not found
+ 7z no encontrado
+
+
+
+ 7z wasn't found in your PATH.
+ 7z no se ha encontrado en el PATH.
+
+
+
+ 7z crashed
+ 7z falló
+
+
+
+ 7z crashed.
+ 7z falló.
+
+
+
+ 7z reading
+ 7z leyendo
+
+
+
+ problem reading from 7z
+ Problema leyendo desde 7z
+
+
+
+ 7z problem
+ 7z problema
+
+
+
+ Unknown error 7z
+ Error desconocido 7z
+
+
+
+ Configuration
+
+
+ Saving config file....
+ Guardando el archivo de configuración...
+
+
+
+ There was a problem saving YACReader configuration. Please, check if you have enough permissions in the YACReader root folder.
+ Hubo un problema al guardar la configuración de YACReader. Por favor, comprueba si tienes suficientes permisos en el directorio raíz de YACReader.
+
+
+
+ GoToDialog
+
+
+ Page :
+ Página :
+
+
+
+ Go To
+ Ir a
+
+
+
+ Cancel
+ Cancelar
+
+
+
+
+ Total pages :
+ Páginas totales:
+
+
+
+ Go to...
+ Ir a...
+
+
+
+ GoToFlow
+
+
+ Page :
+ Página:
+
+
+ Total pages :
+ Page:
+
+
+
+ HelpAboutDialog
+
+
+ About
+ Acerca de
+
+
+
+ Help
+ Ayuda
+
+
+
+ MainWindowViewer
+
+
+ &Open
+ &Abrir
+
+
+
+ O
+ O
+
+
+
+ Open a comic
+ Abrir cómic
+
+
+
+ Open Folder
+ Abrir carpeta
+
+
+
+ Ctrl+O
+ Ctrl+O
+
+
+
+ Open image folder
+ Open images in a folder
+ Abrir carpeta de imágenes
+
+
+
+ Save
+ Guardar
+
+
+
+
+ Save current page
+ Guardar la página actual
+
+
+
+ Previous Comic
+ Cómic anterior
+
+
+
+ Open previous comic
+ Abrir cómic anterior
+
+
+
+ Next Comic
+ Siguiente Cómic
+
+
+
+ Open next comic
+ Abrir siguiente cómic
+
+
+
+ &Previous
+ A&nterior
+
+
+
+ Go to previous page
+ Ir a la página anterior
+
+
+
+ &Next
+ Siguie&nte
+
+
+
+ Go to next page
+ Ir a la página siguiente
+
+
+
+ Fit Width
+ Ajustar anchura
+
+
+
+ A
+ A
+
+
+
+ Fit image to ...
+ Ajustar imagen a...
+
+
+
+ Rotate image to the left
+ Rotar imagen a la izquierda
+
+
+
+ L
+ L
+
+
+
+ Rotate image to the right
+ Rotar imagen a la derecha
+
+
+
+ R
+ R
+
+
+
+ Double page mode
+ Modo a doble página
+
+
+
+ Switch to double page mode
+ Cambiar a modo de doble página
+
+
+
+ D
+ D
+
+
+
+ Go To
+ Ir a
+
+
+
+ G
+ G
+
+
+
+ Go to page ...
+ Ir a página...
+
+
+
+ Options
+ Opciones
+
+
+
+ C
+ C
+
+
+
+ YACReader options
+ Opciones de YACReader
+
+
+
+ Help
+ Ayuda
+
+
+
+ Help, About YACReader
+ Ayuda, Sobre YACReader
+
+
+
+ Magnifying glass
+ Lupa
+
+
+
+ Switch Magnifying glass
+ Lupa On/Off
+
+
+
+ Z
+ Z
+
+
+
+ Set bookmark
+ Añadir marcador
+
+
+
+ Set a bookmark on the current page
+ Añadir un marcador en la página actual
+
+
+
+ Show bookmarks
+ Mostrar marcadores
+
+
+
+ Show the bookmarks of the current comic
+ Mostrar los marcadores del cómic actual
+
+
+
+ M
+ M
+
+
+
+ Show keyboard shortcuts
+ Mostrar atajos de teclado
+
+
+
+ Show Info
+ Mostrar información
+
+
+
+ I
+ I
+
+
+
+ Close
+ Cerrar
+
+
+
+ Show Dictionary
+ Mostrar diccionario
+
+
+
+ Always on top
+ Siempre visible
+
+
+
+ Show full size
+ Mostrar a tamaño original
+
+
+
+ &File
+ &Archivo
+
+
+
+ Open Comic
+ Abrir cómic
+
+
+
+ Comic files (*.cbr *.cbz *.rar *.zip *.tar *.arj)
+ Archivos de cómic (*.cbr *.cbz *.rar *.zip *.tar *.arj)
+
+
+
+ Open folder
+ Abrir carpeta
+
+
+
+ Image files (*.jpg)
+ Archivos de imagen (*.jpg)
+
+
+
+ There is a new version avaliable
+ Hay una nueva versión disponible
+
+
+
+ Do you want to download the new version?
+ ¿Desea descargar la nueva versión?
+
+
+
+ Saving error log file....
+ Guardando el archivo de log...
+
+
+
+ There was a problem saving YACReader error log file. Please, check if you have enough permissions in the YACReader root folder.
+ Hubo un problema al guardar el archivo de log de YACReader. Por favor, comprueba si tienes suficientes permisos en el directorio raíz de YACReader.
+
+
+
+ OptionsDialog
+
+
+ "Go to flow" size
+ Tamaño de "Go to flow"
+
+
+
+ My comics path
+ Ruta a mis cómics
+
+
+
+ Save
+ Guardar
+
+
+
+ Cancel
+ Cancelar
+
+
+
+ How to show pages in GoToFlow:
+ ¿Cómo deseas que se muestren las páginas en "Go To Flow":
+
+
+
+ CoverFlow look
+
+
+
+
+ Stripe look
+
+
+
+
+ Overlapped Stripe look
+ Overlaped Stripe look
+
+
+
+
+ Page width stretch
+ Ajuste en anchura de la página
+
+
+
+ Background color
+ Color de fondo
+
+
+
+ Choose
+ Elegir
+
+
+
+ Restart is needed
+ Es necesario reiniciar
+
+
+
+ Comics directory
+ Directorio de cómics
+
+
+
+ QPushButton
+
+ Hello world!
+ Hola mundo!
+
+
+
+ ShortcutsDialog
+
+
+ YACReader keyboard shortcuts
+ Atajos de teclado de YACReader
+
+
+
+ Close
+ Cerrar
+
+
+
+ Keyboard Shortcuts
+ Atajos de teclado
+
+
+
+ Viewer
+
+
+
+ Press 'O' to open comic.
+ Pulsa 'O' para abrir un fichero.
+
+
+ Show Info
+ Mostrar información
+
+
+ I
+ I
+
+
+
+ Loading...please wait!
+ Cargando...espere, por favor!
+
+
+
diff --git a/YACReader/yacreader_fr.ts b/YACReader/yacreader_fr.ts
new file mode 100644
index 00000000..fd42ce28
--- /dev/null
+++ b/YACReader/yacreader_fr.ts
@@ -0,0 +1,548 @@
+
+
+
+
+ BookmarksDialog
+
+
+ Lastest Page
+
+
+
+
+ Close
+
+
+
+
+ Click on any image to go to the bookmark
+
+
+
+
+
+ Loading...
+
+
+
+
+ Comic
+
+
+ No images found
+
+
+
+
+ There are not images on the selected folder
+
+
+
+
+ File error
+
+
+
+
+ File not found or not images in file
+
+
+
+
+ 7z not found
+
+
+
+
+ 7z wasn't found in your PATH.
+
+
+
+
+ 7z crashed
+
+
+
+
+ 7z crashed.
+
+
+
+
+ 7z reading
+
+
+
+
+ problem reading from 7z
+
+
+
+
+ 7z problem
+
+
+
+
+ Unknown error 7z
+
+
+
+
+ Configuration
+
+
+ Saving config file....
+
+
+
+
+ There was a problem saving YACReader configuration. Please, check if you have enough permissions in the YACReader root folder.
+
+
+
+
+ GoToDialog
+
+
+ Page :
+
+
+
+
+ Go To
+
+
+
+
+ Cancel
+
+
+
+
+
+ Total pages :
+
+
+
+
+ Go to...
+
+
+
+
+ GoToFlow
+
+
+ Page :
+
+
+
+
+ HelpAboutDialog
+
+
+ About
+
+
+
+
+ Help
+
+
+
+
+ MainWindowViewer
+
+
+ &Open
+
+
+
+
+ O
+
+
+
+
+ Open a comic
+
+
+
+
+ Open Folder
+
+
+
+
+ Ctrl+O
+
+
+
+
+ Open image folder
+
+
+
+
+ Save
+
+
+
+
+
+ Save current page
+
+
+
+
+ Previous Comic
+
+
+
+
+ Open previous comic
+
+
+
+
+ Next Comic
+
+
+
+
+ Open next comic
+
+
+
+
+ &Previous
+
+
+
+
+ Go to previous page
+
+
+
+
+ &Next
+
+
+
+
+ Go to next page
+
+
+
+
+ Fit Width
+
+
+
+
+ A
+
+
+
+
+ Fit image to ...
+
+
+
+
+ Rotate image to the left
+
+
+
+
+ L
+
+
+
+
+ Rotate image to the right
+
+
+
+
+ R
+
+
+
+
+ Double page mode
+
+
+
+
+ Switch to double page mode
+
+
+
+
+ D
+
+
+
+
+ Go To
+
+
+
+
+ G
+
+
+
+
+ Go to page ...
+
+
+
+
+ Options
+
+
+
+
+ C
+
+
+
+
+ YACReader options
+
+
+
+
+ Help
+
+
+
+
+ Help, About YACReader
+
+
+
+
+ Magnifying glass
+
+
+
+
+ Switch Magnifying glass
+
+
+
+
+ Z
+
+
+
+
+ Set bookmark
+
+
+
+
+ Set a bookmark on the current page
+
+
+
+
+ Show bookmarks
+
+
+
+
+ Show the bookmarks of the current comic
+
+
+
+
+ M
+
+
+
+
+ Show keyboard shortcuts
+
+
+
+
+ Show Info
+
+
+
+
+ I
+
+
+
+
+ Close
+
+
+
+
+ Show Dictionary
+
+
+
+
+ Always on top
+
+
+
+
+ Show full size
+
+
+
+
+ &File
+
+
+
+
+ Open Comic
+
+
+
+
+ Comic files (*.cbr *.cbz *.rar *.zip *.tar *.arj)
+
+
+
+
+ Open folder
+
+
+
+
+ Image files (*.jpg)
+
+
+
+
+ There is a new version avaliable
+
+
+
+
+ Do you want to download the new version?
+
+
+
+
+ Saving error log file....
+
+
+
+
+ There was a problem saving YACReader error log file. Please, check if you have enough permissions in the YACReader root folder.
+
+
+
+
+ OptionsDialog
+
+
+ "Go to flow" size
+
+
+
+
+ My comics path
+
+
+
+
+ Save
+
+
+
+
+ Cancel
+
+
+
+
+ How to show pages in GoToFlow:
+
+
+
+
+ CoverFlow look
+
+
+
+
+ Stripe look
+
+
+
+
+ Overlapped Stripe look
+
+
+
+
+ Page width stretch
+
+
+
+
+ Background color
+
+
+
+
+ Choose
+
+
+
+
+ Restart is needed
+
+
+
+
+ Comics directory
+
+
+
+
+ ShortcutsDialog
+
+
+ YACReader keyboard shortcuts
+
+
+
+
+ Close
+
+
+
+
+ Keyboard Shortcuts
+
+
+
+
+ Viewer
+
+
+
+ Press 'O' to open comic.
+
+
+
+
+ Loading...please wait!
+
+
+
+
diff --git a/YACReaderLibrary/YACReaderLibrary.pro b/YACReaderLibrary/YACReaderLibrary.pro
new file mode 100644
index 00000000..1963d1ef
--- /dev/null
+++ b/YACReaderLibrary/YACReaderLibrary.pro
@@ -0,0 +1,82 @@
+######################################################################
+# Automatically generated by qmake (2.01a) dom 12. oct 20:47:48 2008
+######################################################################
+
+TEMPLATE = app
+TARGET =
+DEPENDPATH += .
+INCLUDEPATH += .
+INCLUDEPATH += ../common \
+ ./server \
+ ./db
+CONFIG += release
+CONFIG -= flat
+QT += sql network
+
+# Input
+HEADERS += comic_flow.h \
+ create_library_dialog.h \
+ library_creator.h \
+ library_window.h \
+ ../common/pictureflow.h \
+ add_library_dialog.h \
+ ../common/custom_widgets.h \
+ rename_library_dialog.h \
+ properties_dialog.h \
+ options_dialog.h \
+ export_library_dialog.h \
+ import_library_dialog.h \
+ package_manager.h \
+ ../common/qnaturalsorting.h \
+ bundle_creator.h \
+ ./db/data_base_management.h \
+ ./db/treeitem.h \
+ ./db/treemodel.h \
+ ./db/tablemodel.h \
+ ./db/tableitem.h \
+ ./db/comic.h \
+ ./db/folder.h \
+ ./db/library_item.h \
+ export_comics_info_dialog.h \
+ import_comics_info_dialog.h \
+ ../common/check_new_version.h
+
+SOURCES += comic_flow.cpp \
+ create_library_dialog.cpp \
+ library_creator.cpp \
+ library_window.cpp \
+ main.cpp \
+ ../common/pictureflow.cpp \
+ add_library_dialog.cpp \
+ ../common/custom_widgets.cpp \
+ rename_library_dialog.cpp \
+ properties_dialog.cpp \
+ options_dialog.cpp \
+ export_library_dialog.cpp \
+ import_library_dialog.cpp \
+ package_manager.cpp \
+ ../common/qnaturalsorting.cpp \
+ bundle_creator.cpp \
+ ./db/data_base_management.cpp \
+ ./db/treeitem.cpp \
+ ./db/treemodel.cpp \
+ ./db/tablemodel.cpp \
+ ./db/tableitem.cpp \
+ ./db/comic.cpp \
+ ./db/folder.cpp \
+ ./db/library_item.cpp \
+ export_comics_info_dialog.cpp \
+ import_comics_info_dialog.cpp \
+ ../common/check_new_version.cpp
+
+include(./server/server.pri)
+
+
+RESOURCES += images.qrc files.qrc
+RC_FILE = icon.rc
+
+TRANSLATIONS = yacreaderlibrary_es.ts
+
+Release:DESTDIR = ../release
+Debug:DESTDIR = ../debug
+
diff --git a/YACReaderLibrary/add_library_dialog.cpp b/YACReaderLibrary/add_library_dialog.cpp
new file mode 100644
index 00000000..e94b4691
--- /dev/null
+++ b/YACReaderLibrary/add_library_dialog.cpp
@@ -0,0 +1,91 @@
+#include "add_library_dialog.h"
+
+#include
+#include
+#include
+#include
+
+
+AddLibraryDialog::AddLibraryDialog(QWidget * parent)
+:QDialog(parent)
+{
+ setupUI();
+}
+
+void AddLibraryDialog::setupUI()
+{
+ textLabel = new QLabel(tr("Comics folder : "));
+ path = new QLineEdit;
+ textLabel->setBuddy(path);
+
+ nameLabel = new QLabel(tr("Library Name : "));
+ nameEdit = new QLineEdit;
+ nameLabel->setBuddy(nameEdit);
+
+ accept = new QPushButton(tr("Add"));
+ accept->setDisabled(true);
+ connect(accept,SIGNAL(clicked()),this,SLOT(add()));
+
+ cancel = new QPushButton(tr("Cancel"));
+ connect(cancel,SIGNAL(clicked()),this,SLOT(close()));
+
+ find = new QPushButton(QIcon(":/images/comicFolder.png"),"");
+ connect(find,SIGNAL(clicked()),this,SLOT(findPath()));
+
+ QGridLayout * content = new QGridLayout;
+
+ content->addWidget(nameLabel,0,0);
+ content->addWidget(nameEdit,0,1);
+
+ content->addWidget(textLabel,1,0);
+ content->addWidget(path,1,1);
+ content->addWidget(find,1,2);
+ content->setColumnStretch(2,0);
+
+ QHBoxLayout *bottomLayout = new QHBoxLayout;
+ bottomLayout->addStretch();
+ bottomLayout->addWidget(accept);
+ bottomLayout->addWidget(cancel);
+
+ QVBoxLayout *mainLayout = new QVBoxLayout;
+ mainLayout->addLayout(content);
+ mainLayout->addStretch();
+ mainLayout->addLayout(bottomLayout);
+
+ QHBoxLayout * imgMainLayout = new QHBoxLayout;
+ QLabel * imgLabel = new QLabel(this);
+ QPixmap p(":/images/openLibrary.png");
+ imgLabel->setPixmap(p);
+ imgMainLayout->addWidget(imgLabel);//,0,Qt::AlignTop);
+ imgMainLayout->addLayout(mainLayout);
+
+ setLayout(imgMainLayout);
+
+ setModal(true);
+ setWindowTitle(tr("Add an existing library"));
+}
+
+void AddLibraryDialog::add()
+{
+ //accept->setEnabled(false);
+ emit(addLibrary(QDir::cleanPath(path->text()),nameEdit->text()));
+ close();
+}
+
+void AddLibraryDialog::findPath()
+{
+ QString s = QFileDialog::getExistingDirectory(0,"Comics directory",".");
+ if(!s.isEmpty())
+ {
+ path->setText(s);
+ accept->setEnabled(true);
+ }
+}
+
+void AddLibraryDialog::close()
+{
+ path->clear();
+ nameEdit->clear();
+ accept->setEnabled(false);
+ QDialog::close();
+}
\ No newline at end of file
diff --git a/YACReaderLibrary/add_library_dialog.h b/YACReaderLibrary/add_library_dialog.h
new file mode 100644
index 00000000..f6274270
--- /dev/null
+++ b/YACReaderLibrary/add_library_dialog.h
@@ -0,0 +1,33 @@
+#ifndef __ADD_LIBRARY_DIALOG_H
+#define __ADD_LIBRARY_DIALOG_H
+
+#include
+#include
+#include
+#include
+#include
+
+ class AddLibraryDialog : public QDialog
+ {
+ Q_OBJECT
+ public:
+ AddLibraryDialog(QWidget * parent = 0);
+ private:
+ QLabel * nameLabel;
+ QLabel * textLabel;
+ QLineEdit * path;
+ QLineEdit * nameEdit;
+ QPushButton * find;
+ QPushButton * accept;
+ QPushButton * cancel;
+ void setupUI();
+ public slots:
+ void add();
+ void findPath();
+ void close();
+ signals:
+ void addLibrary(QString target, QString name);
+ };
+
+#endif
+
diff --git a/YACReaderLibrary/bundle_creator.cpp b/YACReaderLibrary/bundle_creator.cpp
new file mode 100644
index 00000000..8ea6eef2
--- /dev/null
+++ b/YACReaderLibrary/bundle_creator.cpp
@@ -0,0 +1,13 @@
+#include "bundle_creator.h"
+
+
+BundleCreator::BundleCreator(void)
+ :QObject()
+{
+
+}
+
+
+BundleCreator::~BundleCreator(void)
+{
+}
diff --git a/YACReaderLibrary/bundle_creator.h b/YACReaderLibrary/bundle_creator.h
new file mode 100644
index 00000000..ff4dbd08
--- /dev/null
+++ b/YACReaderLibrary/bundle_creator.h
@@ -0,0 +1,14 @@
+#ifndef __BUNDLE_CREATOR_H
+#define __BUNDLE_CREATOR_H
+
+#include
+
+class BundleCreator : public QObject
+{
+Q_OBJECT
+public:
+ BundleCreator(void);
+ ~BundleCreator(void);
+};
+
+#endif
\ No newline at end of file
diff --git a/YACReaderLibrary/comic_flow.cpp b/YACReaderLibrary/comic_flow.cpp
new file mode 100644
index 00000000..ddc708aa
--- /dev/null
+++ b/YACReaderLibrary/comic_flow.cpp
@@ -0,0 +1,205 @@
+#include "comic_flow.h"
+#include "qnaturalsorting.h"
+
+#include
+#include
+#include
+
+ComicFlow::ComicFlow(QWidget* parent,FlowType flowType)
+:YACReaderFlow(parent,flowType)
+{
+ updateTimer = new QTimer;
+ connect(updateTimer, SIGNAL(timeout()), this, SLOT(updateImageData()));
+
+ worker = new ImageLoader;
+ connect(this, SIGNAL(centerIndexChanged(int)), this, SLOT(preload()));
+
+ setReflectionEffect(PlainReflection);
+}
+
+ComicFlow::~ComicFlow()
+{
+ delete worker;
+ delete updateTimer;
+}
+
+void ComicFlow::setImagePaths(const QStringList& paths)
+{
+ clear();
+
+ //imagePath = path;
+ imageFiles = paths;
+ imagesLoaded.clear();
+ imagesLoaded.fill(false,imageFiles.size());
+ numImagesLoaded = 0;
+
+ imagesSetted.clear();
+ imagesSetted.fill(false,imageFiles.size());
+
+ // populate with empty images
+ QImage img; //TODO remove
+ QString s;
+ for(int i = 0; i < (int)imageFiles.size(); i++)
+ {
+ addSlide(img);
+ s = imageFiles.at(i);
+ s.remove(s.size()-4,4);
+ if(QFileInfo(s+".r").exists())
+ markSlide(i);
+ }
+
+ setCenterIndex(0);
+ worker->reset();
+ preload();
+}
+
+void ComicFlow::preload()
+{
+ if(numImagesLoaded < imagesLoaded.size())
+ updateTimer->start(30); //TODO comprobar rendimiento, originalmente era 70
+}
+
+void ComicFlow::updateImageData()
+{
+ // can't do anything, wait for the next possibility
+ if(worker->busy())
+ return;
+
+ // set image of last one
+ int idx = worker->index();
+ if( idx >= 0 && !worker->result().isNull())
+ {
+ if(!imagesSetted[idx])
+ {
+ setSlide(idx, worker->result());
+ imagesSetted[idx] = true;
+ numImagesLoaded++;
+ }
+ }
+
+ // try to load only few images on the left and right side
+ // i.e. all visible ones plus some extra
+#define COUNT 8
+ int indexes[2*COUNT+1];
+ int center = centerIndex();
+ indexes[0] = center;
+ for(int j = 0; j < COUNT; j++)
+ {
+ indexes[j*2+1] = center+j+1;
+ indexes[j*2+2] = center-j-1;
+ }
+ for(int c = 0; c < 2*COUNT+1; c++)
+ {
+ int i = indexes[c];
+ if((i >= 0) && (i < slideCount()))
+ if(!imagesLoaded[i])//slide(i).isNull())
+ {
+ // schedule thumbnail generation
+ QString fname = imageFiles[i];
+ imagesLoaded[i]=true;
+
+ worker->generate(i, fname, slideSize());
+ return;
+ }
+ }
+
+ // no need to generate anything? stop polling...
+ updateTimer->stop();
+}
+
+void ComicFlow::keyPressEvent(QKeyEvent* event)
+{
+ PictureFlow::keyPressEvent(event);
+}
+
+void ComicFlow::wheelEvent(QWheelEvent * event)
+{
+ if(event->delta()<0)
+ showNext();
+ else
+ showPrevious();
+ event->accept();
+}
+
+//-----------------------------------------------------------------------------
+//ImageLoader
+//-----------------------------------------------------------------------------
+static QImage loadImage(const QString& fileName)
+{
+ QImage image;
+ bool result = image.load(fileName);
+
+ if(!result)
+ return QImage();
+
+ return image;
+}
+
+ImageLoader::ImageLoader():
+QThread(), restart(false), working(false), idx(-1)
+{
+}
+
+ImageLoader::~ImageLoader()
+{
+ mutex.lock();
+ condition.wakeOne();
+ mutex.unlock();
+ wait();
+}
+
+bool ImageLoader::busy() const
+{
+ return isRunning() ? working : false;
+}
+
+void ImageLoader::generate(int index, const QString& fileName, QSize size)
+{
+ mutex.lock();
+ this->idx = index;
+ this->fileName = fileName;
+ this->size = size;
+ this->img = QImage();
+ mutex.unlock();
+
+ if (!isRunning())
+ start();
+ else
+ {
+ // already running, wake up whenever ready
+ restart = true;
+ condition.wakeOne();
+ }
+}
+
+void ImageLoader::run()
+{
+ for(;;)
+ {
+ // copy necessary data
+ mutex.lock();
+ this->working = true;
+ QString fileName = this->fileName;
+ mutex.unlock();
+
+ QImage image = loadImage(fileName);
+
+ // let everyone knows it is ready
+ mutex.lock();
+ this->working = false;
+ this->img = image;
+ mutex.unlock();
+
+ // put to sleep
+ mutex.lock();
+ if (!this->restart)
+ condition.wait(&mutex);
+ restart = false;
+ mutex.unlock();
+ }
+}
+
+QImage ImageLoader::result()
+{
+ return img;
+}
\ No newline at end of file
diff --git a/YACReaderLibrary/comic_flow.h b/YACReaderLibrary/comic_flow.h
new file mode 100644
index 00000000..e4448de2
--- /dev/null
+++ b/YACReaderLibrary/comic_flow.h
@@ -0,0 +1,73 @@
+#ifndef __COMICFLOW_H
+#define __COMICFLOW_H
+
+#include "custom_widgets.h"
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+class ImageLoader;
+class ComicFlow : public YACReaderFlow
+{
+ Q_OBJECT
+public:
+ ComicFlow(QWidget* parent = 0,FlowType flowType = CoverFlowLike);
+ virtual ~ComicFlow();
+
+ void setImagePaths(const QStringList& paths);
+ //bool eventFilter(QObject *target, QEvent *event);
+ void keyPressEvent(QKeyEvent* event);
+
+private slots:
+ void preload();
+ void updateImageData();
+
+private:
+ //QString imagePath;
+ QStringList imageFiles;
+ QVector imagesLoaded;
+ QVector imagesSetted;
+ uint numImagesLoaded;
+ QTimer* updateTimer;
+ ImageLoader* worker;
+ virtual void wheelEvent(QWheelEvent * event);
+};
+
+
+//-----------------------------------------------------------------------------
+// Source code of ImageLoader class was modified from http://code.google.com/p/photoflow/
+//------------------------------------------------------------------------------
+class ImageLoader : public QThread
+{
+public:
+ ImageLoader();
+ ~ImageLoader();
+ // returns FALSE if worker is still busy and can't take the task
+ bool busy() const;
+ void generate(int index, const QString& fileName, QSize size);
+ void reset(){idx = -1;};
+ int index() const { return idx; };
+ QImage result();
+
+protected:
+ void run();
+
+private:
+ QMutex mutex;
+ QWaitCondition condition;
+
+ bool restart;
+ bool working;
+ int idx;
+ QString fileName;
+ QSize size;
+ QImage img;
+};
+
+
+#endif
diff --git a/YACReaderLibrary/create_library_dialog.cpp b/YACReaderLibrary/create_library_dialog.cpp
new file mode 100644
index 00000000..4a608590
--- /dev/null
+++ b/YACReaderLibrary/create_library_dialog.cpp
@@ -0,0 +1,192 @@
+#include "create_library_dialog.h"
+
+#include
+#include
+#include
+#include
+
+
+CreateLibraryDialog::CreateLibraryDialog(QWidget * parent)
+:QDialog(parent)
+{
+ setupUI();
+}
+
+void CreateLibraryDialog::setupUI()
+{
+ textLabel = new QLabel(tr("Comics folder : "));
+ path = new QLineEdit;
+ textLabel->setBuddy(path);
+
+ nameLabel = new QLabel(tr("Library Name : "));
+ nameEdit = new QLineEdit;
+ nameLabel->setBuddy(nameEdit);
+
+ accept = new QPushButton(tr("Create"));
+ accept->setDisabled(true);
+ connect(accept,SIGNAL(clicked()),this,SLOT(create()));
+
+ cancel = new QPushButton(tr("Cancel"));
+ connect(cancel,SIGNAL(clicked()),this,SIGNAL(cancelCreate()));
+ connect(cancel,SIGNAL(clicked()),this,SLOT(close()));
+
+ find = new QPushButton(QIcon(":/images/comicFolder.png"),"");
+ connect(find,SIGNAL(clicked()),this,SLOT(findPath()));
+
+ QGridLayout * content = new QGridLayout;
+
+ //QHBoxLayout *nameLayout = new QHBoxLayout;
+
+ content->addWidget(nameLabel,0,0);
+ content->addWidget(nameEdit,0,1);
+
+ //QHBoxLayout *libraryLayout = new QHBoxLayout;
+
+ content->addWidget(textLabel,1,0);
+ content->addWidget(path,1,1);
+ content->addWidget(find,1,2);
+ content->setColumnMinimumWidth(2,0); //TODO
+
+ QHBoxLayout *middleLayout = new QHBoxLayout;
+
+ progressBar = new QProgressBar(this);
+ progressBar->setMinimum(0);
+ progressBar->setMaximum(0);
+ progressBar->setTextVisible(false);
+ progressBar->hide();
+
+ currentFileLabel = new QLabel("");
+ currentFileLabel->setWordWrap(true);
+ middleLayout->addWidget(currentFileLabel);
+ middleLayout->addStretch();
+ middleLayout->setSizeConstraint(QLayout::SetMaximumSize);
+
+
+ QHBoxLayout *bottomLayout = new QHBoxLayout;
+ bottomLayout->addWidget(message = new QLabel(tr("Create a library could take several minutes. You can stop the process and update the library later for completing the task.")));
+ message->setWordWrap(true);
+ //message->hide();
+ bottomLayout->addStretch();
+ bottomLayout->addWidget(accept);
+ bottomLayout->addWidget(cancel);
+
+ QVBoxLayout *mainLayout = new QVBoxLayout;
+ mainLayout->addLayout(content);
+
+ mainLayout->addLayout(middleLayout);
+ mainLayout->addStretch();
+ mainLayout->addWidget(progressBar);
+ mainLayout->addLayout(bottomLayout);
+
+ QHBoxLayout * imgMainLayout = new QHBoxLayout;
+ QLabel * imgLabel = new QLabel(this);
+ QPixmap p(":/images/new.png");
+ imgLabel->setPixmap(p);
+ imgMainLayout->addWidget(imgLabel);
+ imgMainLayout->addLayout(mainLayout);
+
+ setLayout(imgMainLayout);
+
+ setModal(true);
+ setWindowTitle(tr("Create new library"));
+}
+
+void CreateLibraryDialog::create()
+{
+ progressBar->show();
+ message->show();
+ currentFileLabel->setText("Importing : \n\n\n\n\n");
+ this->adjustSize();
+ accept->setEnabled(false);
+ emit(createLibrary(QDir::cleanPath(path->text()),QDir::cleanPath(path->text())+"/.yacreaderlibrary",nameEdit->text()));
+}
+
+void CreateLibraryDialog::findPath()
+{
+ QString s = QFileDialog::getExistingDirectory(0,"Comics directory",".");
+ if(!s.isEmpty())
+ {
+ path->setText(s);
+ accept->setEnabled(true);
+ }
+}
+
+void CreateLibraryDialog::showCurrentFile(QString file)
+{
+ currentFileLabel->setText(tr("Importing : \n") + file);
+ currentFileLabel->update();
+ //this->adjustSize();
+ //is->update();
+}
+void CreateLibraryDialog::close()
+{
+ progressBar->hide();
+ path->clear();
+ nameEdit->clear();
+ currentFileLabel->setText("");
+ this->adjustSize();
+ accept->setEnabled(true);
+ QDialog::close();
+}
+
+void CreateLibraryDialog::setDataAndStart(QString name, QString path)
+{
+ this->path->setText(path);
+ this->nameEdit->setText(name);
+ show();
+ create();
+}
+//-----------------------------------------------------------------------------
+// UpdateLibraryDialog
+//-----------------------------------------------------------------------------
+UpdateLibraryDialog::UpdateLibraryDialog(QWidget * parent)
+:QDialog(parent)
+{
+ QVBoxLayout * mainLayout = new QVBoxLayout;
+ mainLayout->addWidget(message = new QLabel(tr("Updating....")));
+ mainLayout->addWidget(currentFileLabel = new QLabel("\n\n\n\n"));
+ currentFileLabel->setWordWrap(true);
+
+ QHBoxLayout * bottom = new QHBoxLayout;
+ bottom->addStretch();
+ bottom->addWidget(cancel = new QPushButton(tr("Cancel")));
+
+ connect(cancel,SIGNAL(clicked()),this,SIGNAL(cancelUpdate()));
+ connect(cancel,SIGNAL(clicked()),this,SLOT(close()));
+
+ mainLayout->addStretch();
+
+ progressBar = new QProgressBar(this);
+ progressBar->setMinimum(0);
+ progressBar->setMaximum(0);
+ progressBar->setTextVisible(false);
+
+ mainLayout->addWidget(progressBar);
+ mainLayout->addLayout(bottom);
+
+ QHBoxLayout * imgMainLayout = new QHBoxLayout;
+ QLabel * imgLabel = new QLabel(this);
+ QPixmap p(":/images/updateLibrary.png");
+ imgLabel->setPixmap(p);
+ imgMainLayout->addWidget(imgLabel);
+ imgMainLayout->addLayout(mainLayout);
+
+ setLayout(imgMainLayout);
+
+ setModal(true);
+ setWindowTitle(tr("Update library"));
+}
+
+void UpdateLibraryDialog::showCurrentFile(QString file)
+{
+ currentFileLabel->setText(file);
+ currentFileLabel->update();
+ this->update();
+}
+
+void UpdateLibraryDialog::close()
+{
+ currentFileLabel->setText("");
+ this->adjustSize();
+ QDialog::close();
+}
diff --git a/YACReaderLibrary/create_library_dialog.h b/YACReaderLibrary/create_library_dialog.h
new file mode 100644
index 00000000..a671fcce
--- /dev/null
+++ b/YACReaderLibrary/create_library_dialog.h
@@ -0,0 +1,56 @@
+#ifndef __CREATE_LIBRARY_DIALOG_H
+#define __CREATE_LIBRARY_DIALOG_H
+
+#include
+#include
+#include
+#include
+#include
+#include
+
+ class CreateLibraryDialog : public QDialog
+ {
+ Q_OBJECT
+ public:
+ CreateLibraryDialog(QWidget * parent = 0);
+ private:
+ QLabel * nameLabel;
+ QLabel * textLabel;
+ QLabel * message;
+ QProgressBar *progressBar;
+ QLabel * currentFileLabel;
+ QLineEdit * path;
+ QLineEdit * nameEdit;
+ QPushButton * find;
+ QPushButton * accept;
+ QPushButton * cancel;
+ void setupUI();
+ public slots:
+ void create();
+ void findPath();
+ void showCurrentFile(QString file);
+ void close();
+ void setDataAndStart(QString name, QString paht);
+ signals:
+ void createLibrary(QString source, QString target, QString name);
+ void cancelCreate();
+ };
+
+ class UpdateLibraryDialog : public QDialog
+ {
+ Q_OBJECT
+ public:
+ UpdateLibraryDialog(QWidget * parent = 0);
+ private:
+ QLabel * message;
+ QLabel * currentFileLabel;
+ QProgressBar *progressBar;
+ QPushButton * cancel;
+ public slots:
+ void showCurrentFile(QString file);
+ void close();
+ signals:
+ void cancelUpdate();
+ };
+
+#endif
diff --git a/YACReaderLibrary/db/comic.cpp b/YACReaderLibrary/db/comic.cpp
new file mode 100644
index 00000000..5ac14521
--- /dev/null
+++ b/YACReaderLibrary/db/comic.cpp
@@ -0,0 +1,665 @@
+#include "comic.h"
+
+#include
+#include
+#include
+
+//-----------------------------------------------------------------------------
+//COMIC------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+Comic::Comic()
+{
+
+}
+
+Comic::Comic(qulonglong cparentId, QString cname, QString cpath, QString chash, QSqlDatabase & database)
+{
+ parentId = cparentId;
+ name = cname;
+ path = cpath;
+
+ if(!info.load(chash,database))
+ {
+ info.hash = chash;
+ info.coverPage = new int(1);
+ _hasCover = false;
+ }
+ else
+ _hasCover = true;
+}
+
+QList Comic::getComicsFromParent(qulonglong parentId, QSqlDatabase & db)
+{
+ QList list;
+
+ QSqlQuery selectQuery(db); //TODO check
+ selectQuery.prepare("select c.id,c.parentId,c.fileName,c.path,ci.hash from comic c inner join comic_info ci on (c.comicInfoId = ci.id) where c.parentId = :parentId");
+ selectQuery.bindValue(":parentId", parentId);
+ selectQuery.exec();
+
+ Comic * currentItem;
+ while (selectQuery.next())
+ {
+ QList data;
+ QSqlRecord record = selectQuery.record();
+ for(int i=0;iid = record.value("id").toULongLong();
+ currentItem->parentId = record.value(1).toULongLong();
+ currentItem->name = record.value(2).toString();
+ currentItem->path = record.value(3).toString();
+ currentItem->info.load(record.value(4).toString(),db);
+ int lessThan = 0;
+ if(list.isEmpty())
+ list.append(currentItem);
+ else
+ {
+ Comic * last = static_cast(list.back());
+ QString nameLast = last->name;
+ QString nameCurrent = currentItem->name;
+ QList::iterator i;
+ i = list.end();
+ i--;
+ while ((0 > (lessThan = nameCurrent.localeAwareCompare(nameLast))) && i != list.begin()) //se usa la misma ordenacin que en QDir
+ {
+ i--;
+ nameLast = (*i)->name;
+ }
+ if(lessThan>0) //si se ha encontrado un elemento menor que current, se inserta justo despus
+ list.insert(++i,currentItem);
+ else
+ list.insert(i,currentItem);
+
+ }
+ }
+ //selectQuery.finish();
+ return list;
+}
+
+bool Comic::load(qulonglong idc, QSqlDatabase & db)
+{
+
+ QSqlQuery selectQuery(db); //TODO check
+ selectQuery.prepare("select c.id,c.parentId,c.fileName,c.path,ci.hash from comic c inner join comic_info ci on (c.comicInfoId = ci.id) where c.id = :id");
+ selectQuery.bindValue(":id", idc);
+ selectQuery.exec();
+ this->id = idc;
+ if(selectQuery.next())
+ {
+ QSqlRecord record = selectQuery.record();
+ //id = record.value("id").toULongLong();
+ parentId = record.value("parentId").toULongLong();
+ name = record.value("name").toString();
+ path = record.value("path").toString();
+ info.load(record.value("hash").toString(),db);
+
+ return true;
+ }
+ //selectQuery.finish();
+ return false;
+
+}
+
+qulonglong Comic::insert(QSqlDatabase & db)
+{
+ //TODO comprobar si ya hay comic info con ese hash
+ //TODO cambiar por info.insert(db)
+
+ if(!info.existOnDb)
+ {
+ QSqlQuery comicInfoInsert(db);
+ comicInfoInsert.prepare("INSERT INTO comic_info (hash,numPages) "
+ "VALUES (:hash,:numPages)");
+ comicInfoInsert.bindValue(":hash", info.hash);
+ comicInfoInsert.bindValue(":numPages", *info.numPages);
+ comicInfoInsert.exec();
+ info.id =comicInfoInsert.lastInsertId().toULongLong();
+ _hasCover = false;
+ }
+ else
+ _hasCover = true; //TODO check on disk...
+
+ QSqlQuery query(db);
+ query.prepare("INSERT INTO comic (parentId, comicInfoId, fileName, path) "
+ "VALUES (:parentId,:comicInfoId,:name, :path)");
+ query.bindValue(":parentId", parentId);
+ query.bindValue(":comicInfoId", info.id);
+ query.bindValue(":name", name);
+ query.bindValue(":path", path);
+ query.exec();
+ return query.lastInsertId().toULongLong();
+}
+
+void Comic::update(QSqlDatabase & db)
+{
+
+}
+
+void Comic::removeFromDB(QSqlDatabase & db)
+{
+ QSqlQuery query(db);
+ query.prepare("DELETE FROM comic WHERE id = :id");
+ query.bindValue(":id", id);
+ query.exec();
+ //query.finish();
+}
+
+bool Comic::isDir()
+{
+ return false;
+}
+
+//-----------------------------------------------------------------------------
+//COMIC_INFO-------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+ComicInfo::ComicInfo()
+ :existOnDb(false),
+ title(NULL),
+ coverPage(NULL),
+ numPages(NULL),
+ number(NULL),
+ isBis(NULL),
+ count(NULL),
+ volume(NULL),
+ storyArc(NULL),
+ arcNumber(NULL),
+ arcCount(NULL),
+ genere(NULL),
+ writer(NULL),
+ penciller(NULL),
+ inker(NULL),
+ colorist(NULL),
+ letterer(NULL),
+ coverArtist(NULL),
+ date(NULL),
+ publisher(NULL),
+ format(NULL),
+ color(NULL),
+ ageRating(NULL),
+ synopsis(NULL),
+ characters(NULL),
+ notes(NULL)
+{
+
+}
+
+ComicInfo::ComicInfo(const ComicInfo & comicInfo)
+: title(NULL),
+ coverPage(NULL),
+ numPages(NULL),
+ number(NULL),
+ isBis(NULL),
+ count(NULL),
+ volume(NULL),
+ storyArc(NULL),
+ arcNumber(NULL),
+ arcCount(NULL),
+ genere(NULL),
+ writer(NULL),
+ penciller(NULL),
+ inker(NULL),
+ colorist(NULL),
+ letterer(NULL),
+ coverArtist(NULL),
+ date(NULL),
+ publisher(NULL),
+ format(NULL),
+ color(NULL),
+ ageRating(NULL),
+ synopsis(NULL),
+ characters(NULL),
+ notes(NULL)
+{
+ copyField(title,comicInfo.title);
+ copyField(coverPage,comicInfo.coverPage);
+ copyField(numPages,comicInfo.numPages);
+ copyField(number,comicInfo.number);
+ copyField(isBis,comicInfo.isBis);
+ copyField(count,comicInfo.count);
+ copyField(volume,comicInfo.volume);
+ copyField(storyArc,comicInfo.storyArc);
+ copyField(arcNumber,comicInfo.arcNumber);
+ copyField(arcCount,comicInfo.arcCount);
+ copyField(genere,comicInfo.genere);
+ copyField(writer,comicInfo.writer);
+ copyField(penciller,comicInfo.penciller);
+ copyField(inker,comicInfo.inker);
+ copyField(colorist,comicInfo.colorist);
+ copyField(letterer,comicInfo.letterer);
+ copyField(coverArtist,comicInfo.coverArtist);
+ copyField(date,comicInfo.date);
+ copyField(publisher,comicInfo.publisher);
+ copyField(format,comicInfo.format);
+ copyField(color,comicInfo.color);
+ copyField(ageRating,comicInfo.ageRating);
+ copyField(synopsis,comicInfo.synopsis);
+ copyField(characters,comicInfo.characters);
+ copyField(notes,comicInfo.notes);
+
+ hash = comicInfo.hash;
+ id = comicInfo.id;
+ existOnDb = comicInfo.existOnDb;
+ read = comicInfo.read;
+ edited = comicInfo.edited;
+
+}
+
+ComicInfo::~ComicInfo()
+{
+ delete title;
+ delete coverPage;
+ delete numPages;
+ delete number;
+ delete isBis;
+ delete count;
+ delete volume;
+ delete storyArc;
+ delete arcNumber;
+ delete arcCount;
+ delete genere;
+ delete writer;
+ delete penciller;
+ delete inker;
+ delete colorist;
+ delete letterer;
+ delete coverArtist;
+ delete date;
+ delete publisher;
+ delete format;
+ delete color;
+ delete ageRating;
+ delete synopsis;
+ delete characters;
+ delete notes;
+}
+
+void ComicInfo::setField(const QString & name, QString * & field, QSqlRecord & record)
+{
+ if(!record.value(name).isNull())
+ {
+ field = new QString();
+ *field = record.value(name).toString();
+ }
+}
+
+void ComicInfo::setField(const QString & name, int * & field, QSqlRecord & record)
+{
+ if(!record.value(name).isNull())
+ {
+ field = new int;
+ *field = record.value(name).toInt();
+ }
+}
+
+void ComicInfo::setField(const QString & name, bool * & field, QSqlRecord & record)
+{
+ if(!record.value(name).isNull())
+ {
+ field = new bool;
+ *field = record.value(name).toBool();
+ }
+}
+
+
+void ComicInfo::bindField(const QString & name, QString * field, QSqlQuery & query)
+{
+ if(field != NULL)
+ {
+ query.bindValue(name,*field);
+ }
+}
+
+void ComicInfo::bindField(const QString & name, int * field, QSqlQuery & query)
+{
+ if(field != NULL)
+ {
+ query.bindValue(name,*field);
+ }
+}
+
+void ComicInfo::bindField(const QString & name, bool * field, QSqlQuery & query)
+{
+ if(field != NULL)
+ {
+ query.bindValue(name,*field);
+ }
+}
+
+void ComicInfo::setValue(QString * & field, const QString & value)
+{
+ if(field == NULL)
+ field = new QString;
+ *field = value;
+}
+
+void ComicInfo::setValue(int * & field, int value)
+{
+ if(field == NULL)
+ field = new int;
+ *field = value;
+}
+
+void ComicInfo::setValue(bool * & field, bool value)
+{
+ if(field == NULL)
+ field = new bool;
+ *field = value;
+}
+
+void ComicInfo::copyField(QString * & field, const QString * value)
+{
+ if(value != NULL)
+ field = new QString(*value);
+}
+
+void ComicInfo::copyField(int * & field, int * value)
+{
+ if(value != NULL)
+ field = new int(*value);
+}
+
+void ComicInfo::copyField(bool * & field, bool * value)
+{
+ if(value != NULL)
+ field = new bool(*value);
+}
+
+bool ComicInfo::load(QString hash, QSqlDatabase & db)
+{
+ QSqlQuery findComicInfo(db);
+ findComicInfo.prepare("SELECT * FROM comic_info WHERE hash = :hash");
+ findComicInfo.bindValue(":hash", hash);
+ findComicInfo.exec();
+
+
+ if(findComicInfo.next())
+ {
+ this->hash = hash;
+ QSqlRecord record = findComicInfo.record();
+
+ hash = hash;
+ id = record.value("id").toULongLong();
+ read = record.value("read").toBool();
+ edited = record.value("edited").toBool();
+
+ setField("title",title,record);
+ setField("numPages",numPages,record);
+
+ setField("coverPage",coverPage,record);
+
+ setField("number",number,record);
+ setField("isBis",isBis,record);
+ setField("count",count,record);
+
+ setField("volume",volume,record);
+ setField("storyArc",storyArc,record);
+ setField("arcNumber",arcNumber,record);
+ setField("arcCount",arcCount,record);
+
+ setField("genere",genere,record);
+
+ setField("writer",writer,record);
+ setField("penciller",penciller,record);
+ setField("inker",inker,record);
+ setField("colorist",colorist,record);
+ setField("letterer",letterer,record);
+ setField("coverArtist",coverArtist,record);
+
+ setField("date",date,record);
+ setField("publisher",publisher,record);
+ setField("format",format,record);
+ setField("color",color,record);
+ setField("ageRating",ageRating,record);
+
+ setField("synopsis",synopsis,record);
+ setField("characters",characters,record);
+ setField("notes",notes,record);
+
+ return existOnDb = true;
+ }
+
+ return existOnDb = false;
+}
+
+qulonglong ComicInfo::insert(QSqlDatabase & db)
+{
+ return 0;
+}
+void ComicInfo::removeFromDB(QSqlDatabase & db)
+{
+
+}
+void ComicInfo::update(QSqlDatabase & db)
+{
+ //db.open();
+ QSqlQuery updateComicInfo(db);
+ updateComicInfo.prepare("UPDATE comic_info SET "
+ "title = :title,"
+
+ "coverPage = :coverPage,"
+ "numPages = :numPages,"
+
+ "number = :number,"
+ "isBis = :isBis,"
+ "count = :count,"
+
+ "volume = :volume,"
+ "storyArc = :storyArc,"
+ "arcNumber = :arcNumber,"
+ "arcCount = :arcCount,"
+
+ "genere = :genere,"
+
+ "writer = :writer,"
+ "penciller = :penciller,"
+ "inker = :inker,"
+ "colorist = :colorist,"
+ "letterer = :letterer,"
+ "coverArtist = :coverArtist,"
+
+ "date = :date,"
+ "publisher = :publisher,"
+ "format = :format,"
+ "color = :color,"
+ "ageRating = :ageRating,"
+
+ "synopsis = :synopsis,"
+ "characters = :characters,"
+ "notes = :notes,"
+
+ "read = :read,"
+ "edited = :edited"
+
+ " WHERE id = :id ");
+ bindField(":title",title,updateComicInfo);
+
+ bindField(":coverPage",coverPage,updateComicInfo);
+ bindField(":numPages",numPages,updateComicInfo);
+
+ bindField(":number",number,updateComicInfo);
+ bindField(":isBis",isBis,updateComicInfo);
+ bindField(":count",count,updateComicInfo);
+
+ bindField(":volume",volume,updateComicInfo);
+ bindField(":storyArc",storyArc,updateComicInfo);
+ bindField(":arcNumber",arcNumber,updateComicInfo);
+ bindField(":arcCount",arcCount,updateComicInfo);
+
+ bindField(":genere",genere,updateComicInfo);
+
+ bindField(":writer",writer,updateComicInfo);
+ bindField(":penciller",penciller,updateComicInfo);
+ bindField(":inker",inker,updateComicInfo);
+ bindField(":colorist",colorist,updateComicInfo);
+ bindField(":letterer",letterer,updateComicInfo);
+ bindField(":coverArtist",coverArtist,updateComicInfo);
+
+ bindField(":date",date,updateComicInfo);
+ bindField(":publisher",publisher,updateComicInfo);
+ bindField(":format",format,updateComicInfo);
+ bindField(":color",color,updateComicInfo);
+ bindField(":ageRating",ageRating,updateComicInfo);
+
+ bindField(":synopsis",synopsis,updateComicInfo);
+ bindField(":characters",characters,updateComicInfo);
+ bindField(":notes",notes,updateComicInfo);
+
+ updateComicInfo.bindValue(":read", read?1:0);
+ updateComicInfo.bindValue(":id", id);
+ updateComicInfo.bindValue(":edited", edited?1:0);
+ updateComicInfo.exec();
+ //updateComicInfo.finish();
+ //db.close();
+}
+
+void ComicInfo::updateRead(QSqlDatabase & db)
+{
+ QSqlQuery findComicInfo(db);
+ findComicInfo.prepare("UPDATE comic_info SET "
+ "read = :read"
+ " WHERE id = :id ");
+
+ findComicInfo.bindValue(":read", read?1:0);
+ findComicInfo.bindValue(":id", id);
+ findComicInfo.exec();
+ //findComicInfo.finish();
+}
+
+
+//set fields
+void ComicInfo::setTitle(QString value)
+{
+ setValue(title,value);
+}
+
+void ComicInfo::setCoverPage(int value)
+{
+ setValue(coverPage,value);
+}
+void ComicInfo::setNumPages(int value)
+{
+ setValue(numPages,value);
+}
+
+void ComicInfo::setNumber(int value)
+{
+ setValue(number,value);
+}
+
+void ComicInfo::setIsBis(bool value)
+{
+ setValue(isBis,value);
+}
+
+void ComicInfo::setCount(int value)
+{
+ setValue(count,value);
+}
+
+void ComicInfo::setVolume(QString value)
+{
+ setValue(volume,value);
+}
+
+void ComicInfo::setStoryArc(QString value)
+{
+ setValue(storyArc,value);
+}
+
+void ComicInfo::setArcNumber(int value)
+{
+ setValue(arcNumber,value);
+}
+
+void ComicInfo::setArcCount(int value)
+{
+ setValue(arcCount,value);
+}
+
+void ComicInfo::setGenere(QString value)
+{
+ setValue(genere,value);
+}
+
+void ComicInfo::setWriter(QString value)
+{
+ setValue(writer,value);
+}
+
+void ComicInfo::setPenciller(QString value)
+{
+ setValue(penciller,value);
+}
+
+void ComicInfo::setInker(QString value)
+{
+ setValue(inker,value);
+}
+
+void ComicInfo::setColorist(QString value)
+{
+ setValue(colorist,value);
+}
+
+void ComicInfo::setLetterer(QString value)
+{
+ setValue(letterer,value);
+}
+
+void ComicInfo::setCoverArtist(QString value)
+{
+ setValue(coverArtist,value);
+}
+
+void ComicInfo::setDate(QString value)
+{
+ setValue(date,value);
+}
+
+void ComicInfo::setPublisher(QString value)
+{
+ setValue(publisher,value);
+}
+
+void ComicInfo::setFormat(QString value)
+{
+ setValue(format,value);
+}
+
+void ComicInfo::setColor(bool value)
+{
+ setValue(color,value);
+}
+
+void ComicInfo::setAgeRating(QString value)
+{
+ setValue(ageRating,value);
+}
+
+void ComicInfo::setSynopsis(QString value)
+{
+ setValue(synopsis,value);
+}
+
+void ComicInfo::setCharacters(QString value)
+{
+ setValue(characters,value);
+}
+
+void ComicInfo::setNotes(QString value)
+{
+ setValue(notes,value);
+}
+
+QPixmap ComicInfo::getCover(const QString & basePath)
+{
+ if(cover.isNull())
+ {
+ cover.load(basePath + "/.yacreaderlibrary/covers/" + hash + ".jpg");
+ }
+ QPixmap c;
+ c.convertFromImage(cover);
+ return c;
+}
\ No newline at end of file
diff --git a/YACReaderLibrary/db/comic.h b/YACReaderLibrary/db/comic.h
new file mode 100644
index 00000000..8824dd15
--- /dev/null
+++ b/YACReaderLibrary/db/comic.h
@@ -0,0 +1,139 @@
+#ifndef __COMIC_H
+#define __COMIC_H
+
+#include "library_item.h"
+#include
+#include
+#include
+#include
+
+class ComicInfo
+{
+public:
+ ComicInfo();
+ ComicInfo(const ComicInfo & comicInfo);
+ ~ComicInfo();
+
+ bool load(QString hash, QSqlDatabase & db);
+ qulonglong insert(QSqlDatabase & db);
+ void removeFromDB(QSqlDatabase & db);
+ void update(QSqlDatabase & db);
+ void updateRead(QSqlDatabase & db);
+
+ qulonglong id;
+ bool read;
+ bool edited;
+ QString hash;
+ bool existOnDb;
+
+ QString * title;
+
+ int * coverPage;
+ int * numPages;
+
+ int * number;
+ bool * isBis;
+ int * count;
+
+ QString * volume;
+ QString * storyArc;
+ int * arcNumber;
+ int * arcCount;
+
+ QString * genere;
+
+ QString * writer;
+ QString * penciller;
+ QString * inker;
+ QString * colorist;
+ QString * letterer;
+ QString * coverArtist;
+
+ QString * date;
+ QString * publisher;
+ QString * format;
+ bool * color;
+ QString * ageRating;
+
+ QString * synopsis;
+ QString * characters;
+ QString * notes;
+
+ QImage cover;
+
+ void setTitle(QString value);
+
+ void setCoverPage(int value);
+ void setNumPages(int value);
+
+ void setNumber(int value);
+ void setIsBis(bool value);
+ void setCount(int value);
+
+ void setVolume(QString value);
+ void setStoryArc(QString value);
+ void setArcNumber(int value);
+ void setArcCount(int value);
+
+ void setGenere(QString value);
+
+ void setWriter(QString value);
+ void setPenciller(QString value);
+ void setInker(QString value);
+ void setColorist(QString value);
+ void setLetterer(QString value);
+ void setCoverArtist(QString value);
+
+ void setDate(QString value);
+ void setPublisher(QString value);
+ void setFormat(QString value);
+ void setColor(bool value);
+ void setAgeRating(QString value);
+
+ void setSynopsis(QString value);
+ void setCharacters(QString value);
+ void setNotes(QString value);
+
+ QPixmap getCover(const QString & basePath);
+
+private:
+ void setField(const QString & name, QString * & field, QSqlRecord & record);
+ void setField(const QString & name, int * & field, QSqlRecord & record);
+ void setField(const QString & name, bool * & field, QSqlRecord & record);
+
+ void bindField(const QString & name, QString * field, QSqlQuery & query);
+ void bindField(const QString & name, int * field, QSqlQuery & query);
+ void bindField(const QString & name, bool * field, QSqlQuery & query);
+
+ void setValue(QString * & field, const QString & value);
+ void setValue(int * & field, int value);
+ void setValue(bool * & field, bool value);
+
+ void copyField(QString * & field, const QString * value);
+ void copyField(int * & field, int * value);
+ void copyField(bool * & field, bool * value);
+};
+
+class Comic : public LibraryItem
+{
+private:
+ bool _hasCover;
+public:
+ Comic();
+ Comic(qulonglong cparentId, QString cname, QString cpath, QString chash, QSqlDatabase & database);
+ //Comic(QString fn, QString fp):name(fn),path(fp),knownParent(false), knownId(false){};
+
+ static QList getComicsFromParent(qulonglong parentId, QSqlDatabase & db);
+ bool isDir();
+
+ bool load(qulonglong id, QSqlDatabase & db);
+ qulonglong insert(QSqlDatabase & db);
+ void removeFromDB(QSqlDatabase & db);
+ void update(QSqlDatabase & db);
+ bool hasCover() {return _hasCover;};
+
+ ComicInfo info;
+};
+
+
+#endif
\ No newline at end of file
diff --git a/YACReaderLibrary/db/data_base_management.cpp b/YACReaderLibrary/db/data_base_management.cpp
new file mode 100644
index 00000000..8d9d1aa2
--- /dev/null
+++ b/YACReaderLibrary/db/data_base_management.cpp
@@ -0,0 +1,579 @@
+#include "data_base_management.h"
+
+#include
+#include "library_creator.h"
+#include "check_new_version.h"
+
+static QString fields = "title ,"
+
+ "coverPage,"
+ "numPages,"
+
+ "number,"
+ "isBis,"
+ "count,"
+
+ "volume,"
+ "storyArc,"
+ "arcNumber,"
+ "arcCount,"
+
+ "genere,"
+
+ "writer,"
+ "penciller,"
+ "inker,"
+ "colorist,"
+ "letterer,"
+ "coverArtist,"
+
+ "date,"
+ "publisher,"
+ "format,"
+ "color,"
+ "ageRating,"
+
+ "synopsis,"
+ "characters,"
+ "notes,"
+
+ "hash";
+
+DataBaseManagement::DataBaseManagement()
+ :QObject(),dataBasesList()
+{
+
+}
+
+/*TreeModel * DataBaseManagement::newTreeModel(QString path)
+{
+ //la consulta se ejecuta...
+ QSqlQuery selectQuery(loadDatabase(path));
+ selectQuery.setForwardOnly(true);
+ selectQuery.exec("select * from folder order by parentId,name");
+ //selectQuery.finish();
+ return new TreeModel(selectQuery);
+}*/
+
+QSqlDatabase DataBaseManagement::createDatabase(QString name, QString path)
+{
+ return createDatabase(QDir::cleanPath(path) + "/" + name + ".ydb");
+}
+
+QSqlDatabase DataBaseManagement::createDatabase(QString dest)
+{
+ QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE",dest);
+ db.setDatabaseName(dest);
+ if (!db.open())
+ qDebug() << db.lastError();
+ else {
+ qDebug() << db.tables();
+ }
+
+ {
+ QSqlQuery pragma("PRAGMA foreign_keys = ON",db);
+ //pragma.finish();
+ DataBaseManagement::createTables(db);
+
+ QSqlQuery query("INSERT INTO folder (parentId, name, path) "
+ "VALUES (1,'root', '/')",db);
+ }
+ //query.finish();
+ //db.close();
+
+ return db;
+}
+
+QSqlDatabase DataBaseManagement::loadDatabase(QString path)
+{
+ //TODO check path
+ QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE",path);
+ db.setDatabaseName(path+"/library.ydb");
+ if (!db.open()) {
+ //se devuelve una base de datos vaca e invlida
+
+ return QSqlDatabase();
+ }
+ QSqlQuery pragma("PRAGMA foreign_keys = ON",db);
+ //pragma.finish();
+ //devuelve la base de datos
+ return db;
+}
+
+QSqlDatabase DataBaseManagement::loadDatabaseFromFile(QString filePath)
+{
+ //TODO check path
+ QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE",filePath);
+ db.setDatabaseName(filePath);
+ if (!db.open()) {
+ //se devuelve una base de datos vaca e invlida
+
+ return QSqlDatabase();
+ }
+ {
+ QSqlQuery pragma("PRAGMA foreign_keys = ON",db);
+ }
+ //pragma.finish();
+ //devuelve la base de datos
+ return db;
+}
+
+bool DataBaseManagement::createTables(QSqlDatabase & database)
+{
+ bool success = true;
+
+ //FOLDER (representa una carpeta en disco)
+ {
+ QSqlQuery queryFolder(database);
+ queryFolder.prepare("CREATE TABLE folder (id INTEGER PRIMARY KEY, parentId INTEGER NOT NULL, name TEXT NOT NULL, path TEXT NOT NULL, FOREIGN KEY(parentId) REFERENCES folder(id) ON DELETE CASCADE)");
+ success = success && queryFolder.exec();
+ //queryFolder.finish();
+ //COMIC INFO (representa la informacin de un cmic, cada cmic tendr un idntificador nico formado por un hash sha1'de los primeros 512kb' + su tamao en bytes)
+ QSqlQuery queryComicInfo(database);
+ queryComicInfo.prepare("CREATE TABLE comic_info ("
+ "id INTEGER PRIMARY KEY,"
+ "title TEXT,"
+
+ "coverPage INTEGER DEFAULT 1,"
+ "numPages INTEGER,"
+
+ "number INTEGER,"
+ "isBis BOOLEAN,"
+ "count INTEGER,"
+
+ "volume TEXT,"
+ "storyArc TEXT,"
+ "arcNumber INTEGER,"
+ "arcCount INTEGER,"
+
+ "genere TEXT,"
+
+ "writer TEXT,"
+ "penciller TEXT,"
+ "inker TEXT,"
+ "colorist TEXT,"
+ "letterer TEXT,"
+ "coverArtist TEXT,"
+
+ "date TEXT," //dd/mm/yyyy --> se mostrar en 3 campos diferentes
+ "publisher TEXT,"
+ "format TEXT,"
+ "color BOOLEAN,"
+ "ageRating BOOLEAN,"
+
+ "synopsis TEXT,"
+ "characters TEXT,"
+ "notes TEXT,"
+
+ "hash TEXT UNIQUE NOT NULL,"
+ "edited BOOLEAN DEFAULT 0,"
+ "read BOOLEAN DEFAULT 0)");
+ success = success && queryComicInfo.exec();
+ //queryComicInfo.finish();
+
+ //COMIC (representa un cmic en disco, contiene el nombre de fichero)
+ QSqlQuery queryComic(database);
+ queryComic.prepare("CREATE TABLE comic (id INTEGER PRIMARY KEY, parentId INTEGER NOT NULL, comicInfoId INTEGER NOT NULL, fileName TEXT NOT NULL, path TEXT, FOREIGN KEY(parentId) REFERENCES folder(id) ON DELETE CASCADE, FOREIGN KEY(comicInfoId) REFERENCES comic_info(id))");
+ success = success && queryComic.exec();
+ //queryComic.finish();
+ //DB INFO
+ QSqlQuery queryDBInfo(database);
+ queryDBInfo.prepare("CREATE TABLE db_info (version TEXT NOT NULL)");
+ success = success && queryDBInfo.exec();
+ //queryDBInfo.finish();
+
+ QSqlQuery query("INSERT INTO db_info (version) "
+ "VALUES ('"VERSION"')",database);
+ //query.finish();
+ }
+
+ return success;
+}
+#include
+void DataBaseManagement::exportComicsInfo(QString source, QString dest)
+{
+ //QSqlDatabase sourceDB = loadDatabase(source);
+ QSqlDatabase destDB = loadDatabaseFromFile(dest);
+ //sourceDB.open();
+ {
+ QSqlQuery attach(destDB);
+ attach.prepare("ATTACH DATABASE '"+QDir().toNativeSeparators(dest) +"' AS dest;");
+ //attach.bindValue(":dest",QDir().toNativeSeparators(dest));
+ attach.exec();
+ //attach.finish();
+
+ QSqlQuery attach2(destDB);
+ attach2.prepare("ATTACH DATABASE '"+QDir().toNativeSeparators(source) +"' AS source;");
+ attach2.exec();
+ //attach2.finish();
+
+ //sourceDB.close();
+ QSqlQuery queryDBInfo(destDB);
+ queryDBInfo.prepare("CREATE TABLE dest.db_info (version TEXT NOT NULL)");
+ queryDBInfo.exec();
+ //queryDBInfo.finish();
+
+ /*QSqlQuery queryComicsInfo(sourceDB);
+ queryComicsInfo.prepare("CREATE TABLE dest.comic_info (id INTEGER PRIMARY KEY, hash TEXT NOT NULL, edited BOOLEAN DEFAULT FALSE, title TEXT, read BOOLEAN)");
+ queryComicsInfo.exec();*/
+
+ QSqlQuery query("INSERT INTO dest.db_info (version) "
+ "VALUES ('5.0.0')",destDB);
+ //query.finish();
+
+ QSqlQuery exportData(destDB);
+ exportData.prepare("create table dest.comic_info as select " + fields +
+ " from source.comic_info where source.comic_info.edited = 1");
+ exportData.exec();
+ //exportData.finish();
+ }
+
+ //sourceDB.close();
+ destDB.close();
+ QSqlDatabase::removeDatabase(dest);
+
+}
+
+bool DataBaseManagement::importComicsInfo(QString source, QString dest)
+{
+ QString error;
+ QString driver;
+ QStringList hashes;
+
+ bool b = false;
+
+ QSqlDatabase sourceDB = loadDatabaseFromFile(source);
+ QSqlDatabase destDB = loadDatabaseFromFile(dest);
+
+ {
+ QSqlQuery pragma("PRAGMA synchronous=OFF",destDB);
+
+ QSqlQuery update(destDB);
+ update.prepare("UPDATE comic_info SET "
+ "title = :title,"
+
+ "coverPage = :coverPage,"
+ "numPages = :numPages,"
+
+ "number = :number,"
+ "isBis = :isBis,"
+ "count = :count,"
+
+ "volume = :volume,"
+ "storyArc = :storyArc,"
+ "arcNumber = :arcNumber,"
+ "arcCount = :arcCount,"
+
+ "genere = :genere,"
+
+ "writer = :writer,"
+ "penciller = :penciller,"
+ "inker = :inker,"
+ "colorist = :colorist,"
+ "letterer = :letterer,"
+ "coverArtist = :coverArtist,"
+
+ "date = :date,"
+ "publisher = :publisher,"
+ "format = :format,"
+ "color = :color,"
+ "ageRating = :ageRating,"
+
+ "synopsis = :synopsis,"
+ "characters = :characters,"
+ "notes = :notes,"
+
+ "edited = :edited"
+
+ " WHERE hash = :hash ");
+
+ QSqlQuery insert(destDB);
+ insert.prepare("INSERT INTO comic_info "
+ "(title,"
+ "coverPage,"
+ "numPages,"
+ "number,"
+ "isBis,"
+ "count,"
+ "volume,"
+ "storyArc,"
+ "arcNumber,"
+ "arcCount,"
+ "genere,"
+ "writer,"
+ "penciller,"
+ "inker,"
+ "colorist,"
+ "letterer,"
+ "coverArtist,"
+ "date,"
+ "publisher,"
+ "format,"
+ "color,"
+ "ageRating,"
+ "synopsis,"
+ "characters,"
+ "notes,"
+ "read,"
+ "edited,"
+ "hash)"
+
+ "VALUES (:title,"
+ ":coverPage,"
+ ":numPages,"
+ ":number,"
+ ":isBis,"
+ ":count,"
+
+ ":volume,"
+ ":storyArc,"
+ ":arcNumber,"
+ ":arcCount,"
+
+ ":genere,"
+
+ ":writer,"
+ ":penciller,"
+ ":inker,"
+ ":colorist,"
+ ":letterer,"
+ ":coverArtist,"
+
+ ":date,"
+ ":publisher,"
+ ":format,"
+ ":color,"
+ ":ageRating,"
+
+ ":synopsis,"
+ ":characters,"
+ ":notes,"
+
+ ":read,"
+ ":edited,"
+
+ ":hash )");
+ QSqlQuery newInfo(sourceDB);
+ newInfo.prepare("SELECT * FROM comic_info");
+ newInfo.exec();
+ destDB.transaction();
+ int cp;
+ while (newInfo.next()) //cada tupla deber ser insertada o actualizada
+ {
+ QSqlRecord record = newInfo.record();
+ cp = record.value("coverPage").toInt();
+ if(cp>1)
+ {
+ QSqlQuery checkCoverPage(destDB);
+ checkCoverPage.prepare("SELECT coverPage FROM comic_info where hash = :hash");
+ checkCoverPage.bindValue(":hash",record.value("hash").toString());
+ checkCoverPage.exec();
+ bool extract = false;
+ if(checkCoverPage.next())
+ {
+ extract = checkCoverPage.record().value("coverPage").toInt() != cp;
+ }
+ if(extract)
+ hashes.append(record.value("hash").toString());
+ }
+
+ bindValuesFromRecord(record,update);
+
+ update.bindValue(":edited",1);
+
+
+ update.exec();
+
+ if(update.numRowsAffected() == 0)
+ {
+
+ bindValuesFromRecord(record,insert);
+ insert.bindValue(":edited",1);
+ insert.bindValue(":read",0);
+
+ insert.exec();
+
+ QString error1 = insert.lastError().databaseText();
+ QString error2 = insert.lastError().driverText();
+
+ QMessageBox::critical(NULL,"db",error1);
+ QMessageBox::critical(NULL,"driver",error2);
+ }
+ update.finish();
+ insert.finish();
+ }
+ }
+
+ destDB.commit();
+ QString hash;
+ foreach(hash, hashes)
+ {
+ QSqlQuery getComic(destDB);
+ getComic.prepare("SELECT c.path,ci.coverPage FROM comic c INNER JOIN comic_info ci ON (c.comicInfoId = ci.id) where ci.hash = :hash");
+ getComic.bindValue(":hash",hash);
+ getComic.exec();
+ if(getComic.next())
+ {
+ QString basePath = QString(dest).remove("/.yacreaderlibrary/library.ydb");
+ QString path = basePath + getComic.record().value("path").toString();
+ int coverPage = getComic.record().value("coverPage").toInt();
+ ThumbnailCreator tc(path,basePath+"/.yacreaderlibrary/covers/"+hash+".jpg",coverPage);
+ tc.create();
+
+ }
+ }
+
+ destDB.close();
+ sourceDB.close();
+ QSqlDatabase::removeDatabase(source);
+ QSqlDatabase::removeDatabase(dest);
+ return b;
+
+}
+
+void DataBaseManagement::bindValuesFromRecord(const QSqlRecord & record, QSqlQuery & query)
+{
+ bindString("title",record,query);
+
+ bindInt("coverPage",record,query);
+ bindInt("numPages",record,query);
+
+ bindInt("number",record,query);
+ bindInt("isBis",record,query);
+ bindInt("count",record,query);
+
+ bindString("volume",record,query);
+ bindString("storyArc",record,query);
+ bindInt("arcNumber",record,query);
+ bindInt("arcCount",record,query);
+
+ bindString("genere",record,query);
+
+ bindString("writer",record,query);
+ bindString("penciller",record,query);
+ bindString("inker",record,query);
+ bindString("colorist",record,query);
+ bindString("letterer",record,query);
+ bindString("coverArtist",record,query);
+
+ bindString("date",record,query);
+ bindString("publisher",record,query);
+ bindString("format",record,query);
+ bindInt("color",record,query);
+ bindString("ageRating",record,query);
+
+ bindString("synopsis",record,query);
+ bindString("characters",record,query);
+ bindString("notes",record,query);
+
+ bindString("hash",record,query);
+}
+
+void DataBaseManagement::bindString(const QString & name, const QSqlRecord & record, QSqlQuery & query)
+{
+ if(!record.value(name).isNull())
+ {
+ query.bindValue(":"+name,record.value(name).toString());
+ }
+}
+void DataBaseManagement::bindInt(const QString & name, const QSqlRecord & record, QSqlQuery & query)
+{
+ if(!record.value(name).isNull())
+ {
+ query.bindValue(":"+name,record.value(name).toInt());
+ }
+}
+
+QString DataBaseManagement::checkValidDB(const QString & fullPath)
+{
+ QSqlDatabase db = loadDatabaseFromFile(fullPath);
+ if(db.isValid() && db.isOpen())
+ {
+ QSqlQuery version(db);
+ version.prepare("SELECT * FROM db_info");
+ version.exec();
+ if(version.next())
+ {
+ db.close();
+ QSqlDatabase::removeDatabase(fullPath);
+ return version.record().value("version").toString();
+ }
+ else
+ {
+ db.close();
+ QSqlDatabase::removeDatabase(fullPath);
+ return "";
+ }
+
+ }
+ else
+ {
+ db.close();
+ QSqlDatabase::removeDatabase(fullPath);
+ return "";
+ }
+}
+
+int DataBaseManagement::compareVersions(const QString & v1, const QString v2)
+{
+ QStringList v1l = v1.split('.');
+ QStringList v2l = v2.split('.');
+ QList v1il;
+ QList v2il;
+
+ foreach(QString s, v1l)
+ v1il.append(s.toInt());
+
+ foreach(QString s,v2l)
+ v2il.append(s.toInt());
+
+ for(int i=0;iv2il[i])
+ return 1;
+ }
+
+ if(v1il.length() < v2il.length())
+ return -1;
+ if(v1il.length() == v2il.length())
+ return 0;
+ if(v1il.length() > v2il.length())
+ return 1;
+
+ return 0;
+}
+
+//COMICS_INFO_EXPORTER
+ComicsInfoExporter::ComicsInfoExporter()
+:QThread()
+{
+}
+
+void ComicsInfoExporter::exportComicsInfo(QSqlDatabase & source, QSqlDatabase & dest)
+{
+
+}
+
+void ComicsInfoExporter::run()
+{
+
+}
+
+
+//COMICS_INFO_IMPORTER
+ComicsInfoImporter::ComicsInfoImporter()
+:QThread()
+{
+}
+
+void ComicsInfoImporter::importComicsInfo(QSqlDatabase & source, QSqlDatabase & dest)
+{
+
+}
+
+void ComicsInfoImporter::run()
+{
+
+}
\ No newline at end of file
diff --git a/YACReaderLibrary/db/data_base_management.h b/YACReaderLibrary/db/data_base_management.h
new file mode 100644
index 00000000..470bc24c
--- /dev/null
+++ b/YACReaderLibrary/db/data_base_management.h
@@ -0,0 +1,58 @@
+#ifndef __DATA_BASE_MANAGEMENT_H
+#define __DATA_BASE_MANAGEMENT_H
+
+#include
+#include
+#include
+
+#include "treemodel.h"
+
+class ComicsInfoExporter : public QThread
+{
+ Q_OBJECT
+public:
+ ComicsInfoExporter();
+ void exportComicsInfo(QSqlDatabase & source, QSqlDatabase & dest);
+private:
+ void run();
+};
+
+class ComicsInfoImporter : public QThread
+{
+ Q_OBJECT
+public:
+ ComicsInfoImporter();
+ void importComicsInfo(QSqlDatabase & source, QSqlDatabase & dest);
+private:
+ void run();
+
+};
+
+class DataBaseManagement : public QObject
+{
+ Q_OBJECT
+private:
+ QList dataBasesList;
+ static void bindString(const QString & name, const QSqlRecord & record, QSqlQuery & query);
+ static void bindInt(const QString & name, const QSqlRecord & record, QSqlQuery & query);
+ static void bindValuesFromRecord(const QSqlRecord & record, QSqlQuery & query);
+
+public:
+ DataBaseManagement();
+ //TreeModel * newTreeModel(QString path);
+ //crea una base de datos y todas sus tablas
+ static QSqlDatabase createDatabase(QString name, QString path);
+ static QSqlDatabase createDatabase(QString dest);
+ //carga una base de datos desde la ruta path
+ static QSqlDatabase loadDatabase(QString path);
+ static QSqlDatabase loadDatabaseFromFile(QString path);
+ static bool createTables(QSqlDatabase & database);
+
+ static void exportComicsInfo(QString source, QString dest);
+ static bool importComicsInfo(QString source, QString dest);
+
+ static QString checkValidDB(const QString & fullPath); //retorna "" si la DB es invlida la versin si es vlida.
+ static int compareVersions(const QString & v1, const QString v2); //retorna <0 si v1 < v2, 0 si v1 = v2 y >0 si v1 > v2
+};
+
+#endif
\ No newline at end of file
diff --git a/YACReaderLibrary/db/folder.cpp b/YACReaderLibrary/db/folder.cpp
new file mode 100644
index 00000000..41f2bcaa
--- /dev/null
+++ b/YACReaderLibrary/db/folder.cpp
@@ -0,0 +1,71 @@
+
+#include "folder.h"
+#include
+#include
+#include
+
+qulonglong Folder::insert(QSqlDatabase & db)
+{
+ QSqlQuery query(db);
+ query.prepare("INSERT INTO folder (parentId, name, path) "
+ "VALUES (:parentId, :name, :path)");
+ query.bindValue(":parentId", parentId);
+ query.bindValue(":name", name);
+ query.bindValue(":path", path);
+ query.exec();
+ return query.lastInsertId().toULongLong();
+}
+
+QList Folder::getFoldersFromParent(qulonglong parentId, QSqlDatabase & db)
+{
+ QList list;
+
+ QSqlQuery selectQuery(db); //TODO check
+ selectQuery.prepare("SELECT * FROM folder WHERE parentId = :parentId and id <> 1");
+ selectQuery.bindValue(":parentId", parentId);
+ selectQuery.exec();
+
+ Folder * currentItem;
+ while (selectQuery.next())
+ {
+ QList data;
+ QSqlRecord record = selectQuery.record();
+ for(int i=0;i(list.back());
+ QString nameLast = last->name; //TODO usar info name si est disponible, sino el nombre del fichero.....
+ QString nameCurrent = currentItem->name;
+ QList::iterator i;
+ i = list.end();
+ i--;
+ while ((0 > (lessThan = nameCurrent.localeAwareCompare(nameLast))) && i != list.begin())
+ {
+ i--;
+ nameLast = (*i)->name;
+ }
+ if(lessThan>0) //si se ha encontrado un elemento menor que current, se inserta justo despus
+ list.insert(++i,currentItem);
+ else
+ list.insert(i,currentItem);
+
+ }
+ }
+
+ return list;
+}
+
+void Folder::removeFromDB(QSqlDatabase & db)
+{
+ QSqlQuery query(db);
+ query.prepare("DELETE FROM folder WHERE id = :id");
+ query.bindValue(":id", id);
+ query.exec();
+}
+
diff --git a/YACReaderLibrary/db/folder.h b/YACReaderLibrary/db/folder.h
new file mode 100644
index 00000000..dba5c44c
--- /dev/null
+++ b/YACReaderLibrary/db/folder.h
@@ -0,0 +1,26 @@
+#ifndef __FOLDER_H
+#define __FOLDER_H
+
+#include "library_item.h"
+
+#include
+#include
+
+class Folder : public LibraryItem
+{
+public:
+ bool knownParent;
+ bool knownId;
+
+ Folder():knownParent(false), knownId(false){};
+ Folder(qulonglong sid, qulonglong pid,QString fn, QString fp):knownParent(true), knownId(true){id = sid; parentId = pid;name = fn; path = fp;};
+ Folder(QString fn, QString fp):knownParent(false), knownId(false){name = fn; path = fp;};
+ void setId(qulonglong sid){id = sid;knownId = true;};
+ void setFather(qulonglong pid){parentId = pid;knownParent = true;};
+ static QList getFoldersFromParent(qulonglong parentId, QSqlDatabase & db);
+ qulonglong insert(QSqlDatabase & db);
+ bool isDir(){return true;};
+ void removeFromDB(QSqlDatabase & db);
+};
+
+#endif
\ No newline at end of file
diff --git a/YACReaderLibrary/db/library_item.cpp b/YACReaderLibrary/db/library_item.cpp
new file mode 100644
index 00000000..e69de29b
diff --git a/YACReaderLibrary/db/library_item.h b/YACReaderLibrary/db/library_item.h
new file mode 100644
index 00000000..52c3d654
--- /dev/null
+++ b/YACReaderLibrary/db/library_item.h
@@ -0,0 +1,17 @@
+#ifndef __LIBRARY_ITEM_H
+#define __LIBRARY_ITEM_H
+
+#include
+
+class LibraryItem
+{
+public:
+ virtual bool isDir() = 0;
+ virtual void removeFromDB(QSqlDatabase & db) = 0;
+ QString name;
+ QString path;
+ qulonglong parentId;
+ qulonglong id;
+};
+
+#endif
\ No newline at end of file
diff --git a/YACReaderLibrary/db/tableitem.cpp b/YACReaderLibrary/db/tableitem.cpp
new file mode 100644
index 00000000..c1a4e21f
--- /dev/null
+++ b/YACReaderLibrary/db/tableitem.cpp
@@ -0,0 +1,43 @@
+
+#include
+
+#include "tableitem.h"
+
+//! [0]
+TableItem::TableItem(const QList &data)
+
+{
+ itemData = data;
+}
+//! [0]
+
+//! [1]
+TableItem::~TableItem()
+{
+
+}
+//! [1]
+
+
+//! [5]
+int TableItem::columnCount() const
+{
+ return itemData.count();
+}
+//! [5]
+
+//! [6]
+QVariant TableItem::data(int column) const
+{
+ return itemData.value(column);
+}
+//! [6]
+
+
+//! [8]
+int TableItem::row() const
+{
+
+ return 0;
+}
+//! [8]
diff --git a/YACReaderLibrary/db/tableitem.h b/YACReaderLibrary/db/tableitem.h
new file mode 100644
index 00000000..969c53af
--- /dev/null
+++ b/YACReaderLibrary/db/tableitem.h
@@ -0,0 +1,26 @@
+#ifndef TABLEITEM_H
+#define TABLEITEM_H
+
+#include
+#include
+#include "comic.h"
+
+//! [0]
+class TableItem
+{
+public:
+ TableItem(const QList &data);
+ ~TableItem();
+ int columnCount() const;
+ QVariant data(int column) const;
+ int row() const;
+ unsigned long long int id; //TODO sustituir por una clase adecuada
+ //Comic comic;
+private:
+ QList itemData;
+
+
+};
+//! [0]
+
+#endif
\ No newline at end of file
diff --git a/YACReaderLibrary/db/tablemodel.cpp b/YACReaderLibrary/db/tablemodel.cpp
new file mode 100644
index 00000000..4625acb0
--- /dev/null
+++ b/YACReaderLibrary/db/tablemodel.cpp
@@ -0,0 +1,366 @@
+
+#include
+#include
+
+#include "tableitem.h"
+#include "tablemodel.h"
+#include "data_base_management.h"
+#include "qnaturalsorting.h"
+
+//ci.number,ci.title,c.fileName,ci.numPages,c.id,c.parentId,c.path,ci.hash,ci.read
+#define NUMBER 0
+#define TITLE 1
+#define FILE_NAME 2
+#define NUM_PAGES 3
+#define ID 4
+#define PARENT_ID 5
+#define PATH 6
+#define HASH 7
+#define READ 8
+#define IS_BIS 9
+
+TableModel::TableModel(QObject *parent)
+ : QAbstractItemModel(parent)
+{
+ connect(this,SIGNAL(beforeReset()),this,SIGNAL(modelAboutToBeReset()));
+ connect(this,SIGNAL(reset()),this,SIGNAL(modelReset()));
+}
+
+//! [0]
+TableModel::TableModel( QSqlQuery &sqlquery, QObject *parent)
+ : QAbstractItemModel(parent)
+{
+ setupModelData(sqlquery);
+}
+//! [0]
+
+//! [1]
+TableModel::~TableModel()
+{
+ qDeleteAll(_data);
+}
+//! [1]
+
+//! [2]
+int TableModel::columnCount(const QModelIndex &parent) const
+{
+ if(_data.isEmpty())
+ return 0;
+ return _data.first()->columnCount();
+}
+//! [2]
+
+//! [3]
+QVariant TableModel::data(const QModelIndex &index, int role) const
+{
+ if (!index.isValid())
+ return QVariant();
+
+ if (role == Qt::DecorationRole)
+ {
+ return QVariant();
+ }
+
+ if (role != Qt::DisplayRole)
+ return QVariant();
+
+ TableItem *item = static_cast(index.internalPointer());
+
+ return item->data(index.column());
+}
+//! [3]
+
+//! [4]
+Qt::ItemFlags TableModel::flags(const QModelIndex &index) const
+{
+ if (!index.isValid())
+ return 0;
+
+ return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
+}
+//! [4]
+
+//! [5]
+QVariant TableModel::headerData(int section, Qt::Orientation orientation,
+ int role) const
+{
+ if (orientation == Qt::Horizontal && role == Qt::DisplayRole)
+ {
+ switch(section)//TODO obtener esto de la query
+ {
+ case 0:
+ return QVariant(QString("#"));
+ case 1:
+ return QVariant(QString(tr("Title")));
+ case 2:
+ return QVariant(QString(tr("File Name")));
+ case 3:
+ return QVariant(QString(tr("Pages")));
+ }
+ }
+
+ if(orientation == Qt::Vertical && role == Qt::DecorationRole)
+ return QVariant(QIcon(":/images/icon.png"));
+
+ return QVariant();
+}
+//! [5]
+
+//! [6]
+QModelIndex TableModel::index(int row, int column, const QModelIndex &parent)
+ const
+{
+ if (!hasIndex(row, column, parent))
+ return QModelIndex();
+
+ return createIndex(row, column, _data.at(row));
+}
+//! [6]
+
+//! [7]
+QModelIndex TableModel::parent(const QModelIndex &index) const
+{
+ return QModelIndex();
+}
+//! [7]
+
+//! [8]
+int TableModel::rowCount(const QModelIndex &parent) const
+{
+ TreeItem *parentItem;
+ if (parent.column() > 0)
+ return 0;
+
+ if (!parent.isValid())
+ return _data.count();
+
+ return 0;
+}
+//! [8]
+
+QStringList TableModel::getPaths(const QString & _source)
+{
+ QStringList paths;
+ QString source = _source + "/.yacreaderlibrary/covers/";
+ QList::ConstIterator itr;
+ for(itr = _data.constBegin();itr != _data.constEnd();itr++)
+ {
+ QString hash = (*itr)->data(HASH).toString();
+ paths << source+ hash +".jpg";
+ }
+
+ return paths;
+}
+
+void TableModel::setupModelData(unsigned long long int folderId,const QString & databasePath)
+{
+ //QFile f(QCoreApplication::applicationDirPath()+"/performance.txt");
+ //f.open(QIODevice::Append);
+ beginResetModel();
+ //QElapsedTimer timer;
+ //timer.start();
+ qDeleteAll(_data);
+ _data.clear();
+
+ //QTextStream txtS(&f);
+ //txtS << "TABLEMODEL: Tiempo de borrado: " << timer.elapsed() << "ms\r\n";
+ _databasePath = databasePath;
+ QSqlDatabase db = DataBaseManagement::loadDatabase(databasePath);
+ {
+ //crear la consulta
+ //timer.restart();
+ QSqlQuery selectQuery(db); //TODO check
+ selectQuery.prepare("select ci.number,ci.title,c.fileName,ci.numPages,c.id,c.parentId,c.path,ci.hash,ci.read,ci.isBis from comic c inner join comic_info ci on (c.comicInfoId = ci.id) where c.parentId = :parentId");
+ selectQuery.bindValue(":parentId", folderId);
+ selectQuery.exec();
+ //txtS << "TABLEMODEL: Tiempo de consulta: " << timer.elapsed() << "ms\r\n";
+ //timer.restart();
+ setupModelData(selectQuery);
+ //txtS << "TABLEMODEL: Tiempo de creacin del modelo: " << timer.elapsed() << "ms\r\n";
+ //selectQuery.finish();
+ }
+ db.close();
+ QSqlDatabase::removeDatabase(_databasePath);
+ endResetModel();
+ //f.close();
+}
+
+QString TableModel::getComicPath(QModelIndex mi)
+{
+ if(mi.isValid())
+ return _data.at(mi.row())->data(PATH).toString();
+ return "";
+}
+#define NUMBER_MAX 99999999
+void TableModel::setupModelData(QSqlQuery &sqlquery)
+{
+ TableItem * currentItem;
+ while (sqlquery.next())
+ {
+ QList data;
+ QSqlRecord record = sqlquery.record();
+ for(int i=0;idata(FILE_NAME).toString(); //TODO usar info name si est disponible, sino el nombre del fichero.....
+ QString nameCurrent = currentItem->data(FILE_NAME).toString();
+ int numberLast,numberCurrent;
+ numberLast = numberCurrent = NUMBER_MAX; //TODO change by std limit
+
+ if(!last->data(NUMBER).isNull())
+ numberLast = last->data(NUMBER).toInt();
+
+ if(!currentItem->data(NUMBER).isNull())
+ numberCurrent = currentItem->data(NUMBER).toInt();
+
+ QList::iterator i;
+ i = _data.end();
+ i--;
+
+ if(numberCurrent != NUMBER_MAX)
+ {
+ while ((lessThan =numberCurrent < numberLast) && i != _data.begin())
+ {
+ i--;
+ numberLast = NUMBER_MAX; //TODO change by std limit
+
+ if(!(*i)->data(NUMBER).isNull())
+ numberLast = (*i)->data(NUMBER).toInt();
+ }
+ }
+ else
+ {
+ while ((lessThan = naturalSortLessThanCI(nameCurrent,nameLast)) && i != _data.begin() && numberLast == 99999999)
+ {
+ i--;
+ nameLast = (*i)->data(FILE_NAME).toString();
+ numberLast = NUMBER_MAX; //TODO change by std limit
+
+ if(!(*i)->data(NUMBER).isNull())
+ numberLast = (*i)->data(NUMBER).toInt();
+ }
+
+ }
+ if(!lessThan) //si se ha encontrado un elemento menor que current, se inserta justo despus
+ {
+ if(numberCurrent != NUMBER_MAX)
+ {
+ if(numberCurrent == numberLast)
+ if(currentItem->data(IS_BIS).toBool())
+ {
+ _data.insert(++i,currentItem);
+ }
+ else
+ _data.insert(i,currentItem);
+ else
+ _data.insert(++i,currentItem);
+ }
+ else
+ _data.insert(++i,currentItem);
+ }
+ else
+ {
+ _data.insert(i,currentItem);
+ }
+
+ }
+ }
+}
+
+Comic TableModel::getComic(const QModelIndex & mi)
+{
+ Comic c;
+
+ QSqlDatabase db = DataBaseManagement::loadDatabase(_databasePath);
+ c.load(_data.at(mi.row())->data(ID).toULongLong(),db);
+ db.close();
+ QSqlDatabase::removeDatabase(_databasePath);
+
+ return c;
+}
+
+Comic TableModel::_getComic(const QModelIndex & mi)
+{
+ Comic c;
+
+ QSqlDatabase db = DataBaseManagement::loadDatabase(_databasePath);
+ c.load(_data.at(mi.row())->data(ID).toULongLong(),db);
+ db.close();
+ QSqlDatabase::removeDatabase(_databasePath);
+
+ return c;
+}
+
+
+QVector TableModel::getReadList()
+{
+ int numComics = _data.count();
+ QVector readList(numComics);
+ for(int i=0;idata(READ).toBool();
+ }
+ return readList;
+}
+
+QVector TableModel::setAllComicsRead(bool read)
+{
+ QSqlDatabase db = DataBaseManagement::loadDatabase(_databasePath);
+ db.transaction();
+ int numComics = _data.count();
+ QVector readList(numComics);
+ for(int i=0;idata(READ) = QVariant(true);
+ Comic c;
+ c.load(_data.value(i)->data(ID).toULongLong(),db);
+ c.info.read = read;
+ c.info.update(db);
+ }
+ db.commit();
+ db.close();
+ QSqlDatabase::removeDatabase(_databasePath);
+
+ return readList;
+}
+
+QList TableModel::getComics(QList list)
+{
+ QList comics;
+
+ QSqlDatabase db = DataBaseManagement::loadDatabase(_databasePath);
+ db.transaction();
+ QList::const_iterator itr;
+ for(itr = list.constBegin(); itr!= list.constEnd();itr++)
+ {
+ comics.append(_getComic(*itr));
+ }
+ db.commit();
+ db.close();
+ QSqlDatabase::removeDatabase(_databasePath);
+ return comics;
+}
+
+QModelIndex TableModel::getIndexFromId(quint64 id)
+{
+ QList::ConstIterator itr;
+ int i=0;
+ for(itr = _data.constBegin();itr != _data.constEnd();itr++)
+ {
+ if((*itr)->data(ID).toULongLong() == id)
+ break;
+ i++;
+ }
+
+ return index(i,0);
+}
\ No newline at end of file
diff --git a/YACReaderLibrary/db/tablemodel.h b/YACReaderLibrary/db/tablemodel.h
new file mode 100644
index 00000000..ebdd0847
--- /dev/null
+++ b/YACReaderLibrary/db/tablemodel.h
@@ -0,0 +1,59 @@
+#ifndef TABLEMODEL_H
+#define TABLEMODEL_H
+
+#include
+#include
+#include
+#include
+#include
+
+#include "comic.h"
+
+class TableItem;
+
+//! [0]
+class TableModel : public QAbstractItemModel
+{
+ Q_OBJECT
+
+public:
+ TableModel(QObject *parent = 0);
+ TableModel( QSqlQuery &sqlquery, QObject *parent = 0);
+ ~TableModel();
+
+ QVariant data(const QModelIndex &index, int role) const;
+ Qt::ItemFlags flags(const QModelIndex &index) const;
+ QVariant headerData(int section, Qt::Orientation orientation,
+ int role = Qt::DisplayRole) const;
+ QModelIndex index(int row, int column,
+ const QModelIndex &parent = QModelIndex()) const;
+ QModelIndex parent(const QModelIndex &index) const;
+ int rowCount(const QModelIndex &parent = QModelIndex()) const;
+ int columnCount(const QModelIndex &parent = QModelIndex()) const;
+ void setupModelData(unsigned long long int parentFolder,const QString & databasePath);
+
+ //Mtodos de conveniencia
+ QStringList getPaths(const QString & _source);
+ QString getComicPath(QModelIndex mi);
+ Comic getComic(const QModelIndex & mi); //--> para la edicin
+ QVector getReadList();
+ QVector setAllComicsRead(bool read);
+ QList getComics(QList list); //--> recupera la informacin comn a los comics seleccionados
+ QModelIndex getIndexFromId(quint64 id);
+ //setcomicInfo(QModelIndex & mi); --> inserta en la base datos
+ //setComicInfoForAllComics(); --> inserta la informacin comn a todos los cmics de una sola vez.
+ //setComicInfoForSelectedComis(QList list); -->inserta la informacin comn para los comics seleccionados
+private:
+ void setupModelData( QSqlQuery &sqlquery);
+ Comic _getComic(const QModelIndex & mi);
+ QList _data;
+
+ QString _databasePath;
+
+signals:
+ void beforeReset();
+ void reset();
+};
+//! [0]
+
+#endif
diff --git a/YACReaderLibrary/db/treeitem.cpp b/YACReaderLibrary/db/treeitem.cpp
new file mode 100644
index 00000000..086c1556
--- /dev/null
+++ b/YACReaderLibrary/db/treeitem.cpp
@@ -0,0 +1,147 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+** the names of its contributors may be used to endorse or promote
+** products derived from this software without specific prior written
+** permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*
+ treeitem.cpp
+
+ A container for items of data supplied by the simple tree model.
+*/
+
+#include
+
+#include "treeitem.h"
+#include "qnaturalsorting.h"
+
+//! [0]
+TreeItem::TreeItem(const QList &data, TreeItem *parent)
+{
+ parentItem = parent;
+ itemData = data;
+}
+//! [0]
+
+//! [1]
+TreeItem::~TreeItem()
+{
+ qDeleteAll(childItems);
+}
+//! [1]
+
+//! [2]
+void TreeItem::appendChild(TreeItem *item)
+{
+ item->parentItem = this;
+ //TODO insertar odernado
+ if(childItems.isEmpty())
+ childItems.append(item);
+ else
+ {
+ TreeItem * last = childItems.back();
+ QString nameLast = last->data(1).toString(); //TODO usar info name si est disponible, sino el nombre del fichero.....
+ QString nameCurrent = item->data(1).toString();
+ QList::iterator i;
+ i = childItems.end();
+ i--;
+ while (naturalSortLessThanCI(nameCurrent,nameLast) && i != childItems.begin())
+ {
+ i--;
+ nameLast = (*i)->data(1).toString();
+ }
+ if(!naturalSortLessThanCI(nameCurrent,nameLast)) //si se ha encontrado un elemento menor que current, se inserta justo despus
+ childItems.insert(++i,item);
+ else
+ childItems.insert(i,item);
+
+ }
+
+ //childItems.append(item);
+}
+//! [2]
+
+//! [3]
+TreeItem *TreeItem::child(int row)
+{
+ return childItems.value(row);
+}
+//! [3]
+
+//! [4]
+int TreeItem::childCount() const
+{
+ return childItems.count();
+}
+//! [4]
+
+//! [5]
+int TreeItem::columnCount() const
+{
+ return itemData.count();
+}
+//! [5]
+
+//! [6]
+QVariant TreeItem::data(int column) const
+{
+ return itemData.value(column);
+}
+//! [6]
+
+//! [7]
+TreeItem *TreeItem::parent()
+{
+ return parentItem;
+}
+//! [7]
+
+//! [8]
+int TreeItem::row() const
+{
+ if (parentItem)
+ return parentItem->childItems.indexOf(const_cast(this));
+
+ return 0;
+}
+//! [8]
+
+
+QList TreeItem::getData() const
+{
+ return itemData;
+}
\ No newline at end of file
diff --git a/YACReaderLibrary/db/treeitem.h b/YACReaderLibrary/db/treeitem.h
new file mode 100644
index 00000000..3cdf35f7
--- /dev/null
+++ b/YACReaderLibrary/db/treeitem.h
@@ -0,0 +1,78 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+** the names of its contributors may be used to endorse or promote
+** products derived from this software without specific prior written
+** permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef TREEITEM_H
+#define TREEITEM_H
+
+#include
+#include
+#include
+
+//! [0]
+class TreeItem
+{
+public:
+ TreeItem(const QList &data, TreeItem *parent = 0);
+ ~TreeItem();
+
+ void appendChild(TreeItem *child);
+
+ TreeItem *child(int row);
+ int childCount() const;
+ int columnCount() const;
+ QVariant data(int column) const;
+ QList getData() const;
+ int row() const;
+ TreeItem *parent();
+ TreeItem *parentItem;
+ unsigned long long int id;
+ QList comicNames;
+ TreeItem * originalItem;
+private:
+ QList childItems;
+ QList itemData;
+
+
+
+
+};
+//! [0]
+
+#endif
diff --git a/YACReaderLibrary/db/treemodel.cpp b/YACReaderLibrary/db/treemodel.cpp
new file mode 100644
index 00000000..b207edc8
--- /dev/null
+++ b/YACReaderLibrary/db/treemodel.cpp
@@ -0,0 +1,413 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+** the names of its contributors may be used to endorse or promote
+** products derived from this software without specific prior written
+** permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*
+ treemodel.cpp
+
+ Provides a simple tree model to show how to create and use hierarchical
+ models.
+*/
+
+#include
+
+
+#include "treeitem.h"
+#include "treemodel.h"
+#include "data_base_management.h"
+
+#define ROOT 1
+
+TreeModel::TreeModel(QObject *parent)
+ : QAbstractItemModel(parent),rootItem(0),rootBeforeFilter(0),filterEnabled(false),includeComics(false)
+{
+ connect(this,SIGNAL(beforeReset()),this,SIGNAL(modelAboutToBeReset()));
+ connect(this,SIGNAL(reset()),this,SIGNAL(modelReset()));
+}
+
+//! [0]
+TreeModel::TreeModel( QSqlQuery &sqlquery, QObject *parent)
+ : QAbstractItemModel(parent),rootItem(0),rootBeforeFilter(0),filterEnabled(false),includeComics(false)
+{
+ //lo ms probable es que el nodo raz no necesite tener informacin
+ QList rootData;
+ rootData << "root"; //id 0, padre 0, title "root" (el id, y el id del padre van a ir en la clase TreeItem)
+ rootItem = new TreeItem(rootData);
+ rootItem->id = ROOT;
+ rootItem->parentItem = 0;
+ setupModelData(sqlquery, rootItem);
+ //sqlquery.finish();
+}
+//! [0]
+
+//! [1]
+TreeModel::~TreeModel()
+{
+ if(rootItem != 0)
+ delete rootItem;
+}
+//! [1]
+
+//! [2]
+int TreeModel::columnCount(const QModelIndex &parent) const
+{
+ if (parent.isValid())
+ return static_cast(parent.internalPointer())->columnCount();
+ else
+ return rootItem->columnCount();
+}
+//! [2]
+
+//! [3]
+QVariant TreeModel::data(const QModelIndex &index, int role) const
+{
+ if (!index.isValid())
+ return QVariant();
+
+ if (role == Qt::DecorationRole)
+ return QVariant(QIcon(":/images/folder.png"));
+
+ if (role != Qt::DisplayRole)
+ return QVariant();
+
+ TreeItem *item = static_cast(index.internalPointer());
+
+ return item->data(index.column());
+}
+//! [3]
+
+//! [4]
+Qt::ItemFlags TreeModel::flags(const QModelIndex &index) const
+{
+ if (!index.isValid())
+ return 0;
+
+ return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
+}
+//! [4]
+
+//! [5]
+QVariant TreeModel::headerData(int section, Qt::Orientation orientation,
+ int role) const
+{
+ if (orientation == Qt::Horizontal && role == Qt::DisplayRole)
+ return rootItem->data(section);
+
+ return QVariant();
+}
+//! [5]
+
+//! [6]
+QModelIndex TreeModel::index(int row, int column, const QModelIndex &parent)
+ const
+{
+ if (!hasIndex(row, column, parent))
+ return QModelIndex();
+
+ TreeItem *parentItem;
+
+ if (!parent.isValid())
+ parentItem = rootItem;
+ else
+ parentItem = static_cast(parent.internalPointer());
+
+ TreeItem *childItem = parentItem->child(row);
+ if (childItem)
+ return createIndex(row, column, childItem);
+ else
+ return QModelIndex();
+}
+//! [6]
+
+//! [7]
+QModelIndex TreeModel::parent(const QModelIndex &index) const
+{
+ if (!index.isValid())
+ return QModelIndex();
+
+ TreeItem *childItem = static_cast(index.internalPointer());
+ TreeItem *parentItem = childItem->parent();
+
+ if (parentItem == rootItem)
+ return QModelIndex();
+
+ return createIndex(parentItem->row(), 0, parentItem);
+}
+//! [7]
+
+QModelIndex TreeModel::indexFromItem(TreeItem * item,int column)
+{
+ //if(item->parent() != 0)
+ // return index(item->row(),column,parent(indexFromItem(item->parent(),column-1)));
+ //else
+ // return index(item->row(),0,QModelIndex());
+ return createIndex(item->row(), column, item);
+}
+
+
+//! [8]
+int TreeModel::rowCount(const QModelIndex &parent) const
+{
+ TreeItem *parentItem;
+ if (parent.column() > 0)
+ return 0;
+
+ if (!parent.isValid())
+ parentItem = rootItem;
+ else
+ parentItem = static_cast(parent.internalPointer());
+
+ return parentItem->childCount();
+}
+//! [8]
+
+void TreeModel::setupModelData(QString path)
+{
+ beginResetModel();
+ if(rootItem != 0)
+ delete rootItem; //TODO comprobar que se libera bien la memoria
+ filterEnabled = false;
+ rootItem = 0;
+ rootBeforeFilter = 0;
+ //inicializar el nodo raz
+ QList rootData;
+ rootData << "root"; //id 0, padre 0, title "root" (el id, y el id del padre van a ir en la clase TreeItem)
+ rootItem = new TreeItem(rootData);
+ rootItem->id = ROOT;
+ rootItem->parentItem = 0;
+
+ //cargar la base de datos
+ _databasePath = path;
+ QSqlDatabase db = DataBaseManagement::loadDatabase(path);
+ //crear la consulta
+ {
+ QSqlQuery selectQuery("select * from folder where id <> 1 order by parentId,name",db);
+
+ setupModelData(selectQuery,rootItem);
+ }
+ //selectQuery.finish();
+ db.close();
+ QSqlDatabase::removeDatabase(path);
+ endResetModel();
+
+}
+
+
+void TreeModel::setupModelData(QSqlQuery &sqlquery, TreeItem *parent)
+{
+ //64 bits para la primary key, es decir la misma precisin que soporta sqlit 2^64
+ //el diccionario permitir encontrar cualquier nodo del rbol rpidamente, de forma que aadir un hijo a un padre sea O(1)
+ items.clear();
+ //se aade el nodo 0
+ items.insert(parent->id,parent);
+
+ while (sqlquery.next()) {
+ QList data;
+ QSqlRecord record = sqlquery.record();
+
+ data << record.value("name").toString();
+ data << record.value("path").toString();
+ TreeItem * item = new TreeItem(data);
+
+ item->id = record.value("id").toULongLong();
+ //la insercin de hijos se hace de forma ordenada
+ items.value(record.value("parentId").toULongLong())->appendChild(item);
+ //se aade el item al map, de forma que se pueda encontrar como padre en siguientes iteraciones
+ items.insert(item->id,item);
+ }
+}
+
+void TreeModel::setupFilteredModelData()
+{
+ beginResetModel();
+
+ //TODO hay que liberar memoria de anteriores filtrados
+
+ //inicializar el nodo raz
+
+ if(rootBeforeFilter == 0)
+ rootBeforeFilter = rootItem;
+ else
+ delete rootItem;//los resultados de la bsqueda anterior deben ser borrados
+
+ QList rootData;
+ rootData << "root"; //id 1, padre 1, title "root" (el id, y el id del padre van a ir en la clase TreeItem)
+ rootItem = new TreeItem(rootData);
+ rootItem->id = ROOT;
+ rootItem->parentItem = 0;
+
+ //cargar la base de datos
+ QSqlDatabase db = DataBaseManagement::loadDatabase(_databasePath);
+ //crear la consulta
+ {
+ QSqlQuery selectQuery(db); //TODO check
+ if(!includeComics)
+ {
+ selectQuery.prepare("select * from folder where id <> 1 and upper(name) like upper(:filter) order by parentId,name ");
+ selectQuery.bindValue(":filter", "%%"+filter+"%%");
+ }
+ else
+ {
+ selectQuery.prepare("SELECT DISTINCT f.id, f.parentId, f.name, f.path FROM folder f INNER JOIN comic c ON (f.id = c.parentId) WHERE f.id <> 1 AND ((UPPER(c.fileName) like UPPER(:filter)) OR (UPPER(f.name) like UPPER(:filter2))) ORDER BY f.parentId,f.name");
+ selectQuery.bindValue(":filter", "%%"+filter+"%%");
+ selectQuery.bindValue(":filter2", "%%"+filter+"%%");
+ }
+ selectQuery.exec();
+
+ setupFilteredModelData(selectQuery,rootItem);
+ }
+ //selectQuery.finish();
+ db.close();
+ QSqlDatabase::removeDatabase(_databasePath);
+
+ endResetModel();
+}
+
+void TreeModel::setupFilteredModelData(QSqlQuery &sqlquery, TreeItem *parent)
+{
+ //64 bits para la primary key, es decir la misma precisin que soporta sqlit 2^64
+ filteredItems.clear();
+
+ //se aade el nodo 0 al modelo que representa el arbol de elementos que cumplen con el filtro
+ filteredItems.insert(parent->id,parent);
+
+ while (sqlquery.next()) { //se procesan todos los folders que cumplen con el filtro
+ //datos de la base de datos
+ QList data;
+ QSqlRecord record = sqlquery.record();
+
+ data << record.value("name").toString();
+ data << record.value("path").toString();
+ TreeItem * item = new TreeItem(data);
+ item->id = sqlquery.value(0).toULongLong();
+
+ //id del padre
+ quint64 parentId = record.value("parentId").toULongLong();
+
+ //se aade el item al map, de forma que se pueda encontrar como padre en siguientes iteraciones
+ if(!filteredItems.contains(item->id))
+ filteredItems.insert(item->id,item);
+
+ //es necesario conocer las coordenadas de origen para poder realizar scroll automtico en la vista
+ item->originalItem = items.value(item->id);
+
+ //si el padre ya existe en el modelo, el item se aade como hijo
+ if(filteredItems.contains(parentId))
+ filteredItems.value(parentId)->appendChild(item);
+ else//si el padre an no se ha aadido, hay que aadirlo a l y todos los padres hasta el nodo raz
+ {
+ //comprobamos con esta variable si el ltimo de los padres (antes del nodo raz) ya exista en el modelo
+ bool parentPreviousInserted = false;
+
+ //mientras no se alcance el nodo raz se procesan todos los padres (de abajo a arriba)
+ while(parentId != ROOT )
+ {
+ //el padre no estaba en el modelo filtrado, as que se rescata del modelo original
+ TreeItem * parentItem = items.value(parentId);
+ //se debe crear un nuevo nodo (para no compartir los hijos con el nodo original)
+ TreeItem * newparentItem = new TreeItem(parentItem->getData()); //padre que se aadir a la estructura de directorios filtrados
+ newparentItem->id = parentId;
+
+ newparentItem->originalItem = parentItem;
+
+ //si el modelo contiene al padre, se aade el item actual como hijo
+ if(filteredItems.contains(parentId))
+ {
+ filteredItems.value(parentId)->appendChild(item);
+ parentPreviousInserted = true;
+ }
+ //sino se registra el nodo para poder encontrarlo con posterioridad y se aade el item actual como hijo
+ else
+ {
+ newparentItem->appendChild(item);
+ filteredItems.insert(newparentItem->id,newparentItem);
+ parentPreviousInserted = false;
+ }
+
+ //variables de control del bucle, se avanza hacia el nodo padre
+ item = newparentItem;
+ parentId = parentItem->parentItem->id;
+ }
+
+ //si el nodo es hijo de 1 y no haba sido previamente insertado como hijo, se aade como tal
+ if(!parentPreviousInserted)
+ filteredItems.value(ROOT)->appendChild(item);
+ }
+ }
+}
+
+
+
+QString TreeModel::getDatabase()
+{
+ return _databasePath;
+}
+
+QString TreeModel::getFolderPath(const QModelIndex &folder)
+{
+ return static_cast(folder.internalPointer())->data(1).toString();
+}
+
+void TreeModel::setFilter(QString filter, bool includeComics)
+{
+ this->filter = filter;
+ this->includeComics = includeComics;
+ filterEnabled = true;
+ setupFilteredModelData();
+}
+
+void TreeModel::resetFilter()
+{
+ beginResetModel();
+ filter = "";
+ includeComics = false;
+ //TODO hay que liberar la memoria reservada para el filtrado
+ //items.clear();
+ filteredItems.clear();
+ TreeItem * root = rootItem;
+ rootItem = rootBeforeFilter; //TODO si no se aplica el filtro previamente, esto invalidara en modelo
+ if(root !=0)
+ delete root;
+
+ rootBeforeFilter = 0;
+ filterEnabled = false;
+ endResetModel();
+
+
+}
\ No newline at end of file
diff --git a/YACReaderLibrary/db/treemodel.h b/YACReaderLibrary/db/treemodel.h
new file mode 100644
index 00000000..eb61b13d
--- /dev/null
+++ b/YACReaderLibrary/db/treemodel.h
@@ -0,0 +1,106 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+** the names of its contributors may be used to endorse or promote
+** products derived from this software without specific prior written
+** permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef TREEMODEL_H
+#define TREEMODEL_H
+
+#include
+#include
+#include
+#include
+#include
+
+class TreeItem;
+
+//! [0]
+class TreeModel : public QAbstractItemModel
+{
+ Q_OBJECT
+
+public:
+ TreeModel(QObject *parent = 0);
+ TreeModel( QSqlQuery &sqlquery, QObject *parent = 0);
+ ~TreeModel();
+
+ QVariant data(const QModelIndex &index, int role) const;
+ Qt::ItemFlags flags(const QModelIndex &index) const;
+ QVariant headerData(int section, Qt::Orientation orientation,
+ int role = Qt::DisplayRole) const;
+ QModelIndex index(int row, int column,
+ const QModelIndex &parent = QModelIndex()) const;
+ QModelIndex parent(const QModelIndex &index) const;
+ QModelIndex indexFromItem(TreeItem * item, int column);
+ /*QModelIndex _indexFromItem(TreeItem * item, int column);
+ int column;*/
+
+ int rowCount(const QModelIndex &parent = QModelIndex()) const;
+ int columnCount(const QModelIndex &parent = QModelIndex()) const;
+ void setupModelData(QString path);
+ QString getDatabase();
+
+ //Mtodos de conveniencia
+ QString getFolderPath(const QModelIndex &folder);
+
+ void setFilter(QString filter, bool includeComics);
+ void resetFilter();
+ bool isFilterEnabled(){return filterEnabled;};
+private:
+ void setupModelData( QSqlQuery &sqlquery, TreeItem *parent);
+ void setupFilteredModelData( QSqlQuery &sqlquery, TreeItem *parent);
+ void setupFilteredModelData();
+
+ TreeItem *rootItem; //el rbol
+ QMap items; //relacin entre folders
+
+ TreeItem *rootBeforeFilter;
+ QMap filteredItems; //relacin entre folders
+
+ QString _databasePath;
+
+ bool includeComics;
+ QString filter;
+ bool filterEnabled;
+signals:
+ void beforeReset();
+ void reset();
+};
+//! [0]
+
+#endif
diff --git a/YACReaderLibrary/export_comics_info_dialog.cpp b/YACReaderLibrary/export_comics_info_dialog.cpp
new file mode 100644
index 00000000..4a4b3208
--- /dev/null
+++ b/YACReaderLibrary/export_comics_info_dialog.cpp
@@ -0,0 +1,84 @@
+#include "export_comics_info_dialog.h"
+
+#include
+#include
+#include
+#include
+
+#include "data_base_management.h"
+
+ExportComicsInfoDialog::ExportComicsInfoDialog(QWidget *parent)
+ : QDialog(parent)
+{
+ textLabel = new QLabel(tr("Output file : "));
+ path = new QLineEdit;
+ textLabel->setBuddy(path);
+
+ accept = new QPushButton(tr("Create"));
+ accept->setDisabled(true);
+ connect(accept,SIGNAL(clicked()),this,SLOT(exportComicsInfo()));
+
+ cancel = new QPushButton(tr("Cancel"));
+ connect(cancel,SIGNAL(clicked()),this,SLOT(close()));
+ connect(cancel,SIGNAL(clicked()),this,SIGNAL(rejected()));
+
+ find = new QPushButton(QIcon(":/images/db.png"),"");
+ connect(find,SIGNAL(clicked()),this,SLOT(findPath()));
+
+ QHBoxLayout *libraryLayout = new QHBoxLayout;
+
+ libraryLayout->addWidget(textLabel);
+ libraryLayout->addWidget(path);
+ libraryLayout->addWidget(find);
+ libraryLayout->setStretchFactor(find,0); //TODO
+
+ QHBoxLayout *bottomLayout = new QHBoxLayout;
+ bottomLayout->addStretch();
+ bottomLayout->addWidget(accept);
+ bottomLayout->addWidget(cancel);
+
+ QVBoxLayout *mainLayout = new QVBoxLayout;
+ mainLayout->addLayout(libraryLayout);
+ mainLayout->addWidget(progress=new QLabel());
+ mainLayout->addStretch();
+ mainLayout->addLayout(bottomLayout);
+
+ QHBoxLayout * imgMainLayout = new QHBoxLayout;
+ QLabel * imgLabel = new QLabel(this);
+ QPixmap p(":/images/exportComicsInfo.png");
+ imgLabel->setPixmap(p);
+ imgMainLayout->addWidget(imgLabel);
+ imgMainLayout->addLayout(mainLayout);
+
+ setLayout(imgMainLayout);
+
+ setModal(true);
+ setWindowTitle(tr("Export comics info"));
+}
+
+ExportComicsInfoDialog::~ExportComicsInfoDialog()
+{
+
+}
+
+void ExportComicsInfoDialog::findPath()
+{
+ QString s = QFileDialog::getSaveFileName(this,tr("Destination database name"),".","*.ydb");
+ if(!s.isEmpty())
+ {
+ path->setText(s);
+ accept->setEnabled(true);
+ }
+}
+
+void ExportComicsInfoDialog::exportComicsInfo()
+{
+ DataBaseManagement::exportComicsInfo(source,path->text());
+ close();
+}
+
+void ExportComicsInfoDialog::close()
+{
+ path->clear();
+ QDialog::close();
+}
\ No newline at end of file
diff --git a/YACReaderLibrary/export_comics_info_dialog.h b/YACReaderLibrary/export_comics_info_dialog.h
new file mode 100644
index 00000000..07e3bf0d
--- /dev/null
+++ b/YACReaderLibrary/export_comics_info_dialog.h
@@ -0,0 +1,35 @@
+#ifndef EXPORT_COMICS_INFO_DIALOG_H
+#define EXPORT_COMICS_INFO_DIALOG_H
+
+#include
+#include
+#include
+#include
+
+
+class ExportComicsInfoDialog : public QDialog
+{
+ Q_OBJECT
+
+public:
+ ExportComicsInfoDialog(QWidget *parent = 0);
+ ~ExportComicsInfoDialog();
+ QString source;
+
+public slots:
+ void findPath();
+ void exportComicsInfo();
+ void close();
+
+private:
+ QLabel * progress;
+ QLabel * textLabel;
+ QLineEdit * path;
+ QPushButton * find;
+ QPushButton * accept;
+ QPushButton * cancel;
+
+
+};
+
+#endif // EXPORT_COMICS_INFO_DIALOG_H
diff --git a/YACReaderLibrary/export_library_dialog.cpp b/YACReaderLibrary/export_library_dialog.cpp
new file mode 100644
index 00000000..66e0b212
--- /dev/null
+++ b/YACReaderLibrary/export_library_dialog.cpp
@@ -0,0 +1,96 @@
+#include "export_library_dialog.h"
+#include
+#include
+#include
+#include
+
+ExportLibraryDialog::ExportLibraryDialog(QWidget * parent)
+:QDialog(parent),progressCount(0)
+{
+ textLabel = new QLabel(tr("Output folder : "));
+ path = new QLineEdit;
+ textLabel->setBuddy(path);
+
+ accept = new QPushButton(tr("Create"));
+ accept->setDisabled(true);
+ connect(accept,SIGNAL(clicked()),this,SLOT(exportLibrary()));
+
+ cancel = new QPushButton(tr("Cancel"));
+ connect(cancel,SIGNAL(clicked()),this,SLOT(close()));
+ connect(cancel,SIGNAL(clicked()),this,SIGNAL(rejected()));
+
+ find = new QPushButton(QIcon(":/images/comicFolder.png"),"");
+ connect(find,SIGNAL(clicked()),this,SLOT(findPath()));
+
+ QHBoxLayout *libraryLayout = new QHBoxLayout;
+
+ libraryLayout->addWidget(textLabel);
+ libraryLayout->addWidget(path);
+ libraryLayout->addWidget(find);
+ libraryLayout->setStretchFactor(find,0); //TODO
+
+ QHBoxLayout *bottomLayout = new QHBoxLayout;
+ bottomLayout->addStretch();
+ bottomLayout->addWidget(accept);
+ bottomLayout->addWidget(cancel);
+
+ progressBar = new QProgressBar(this);
+ progressBar->setMinimum(0);
+ progressBar->setMaximum(0);
+ progressBar->setTextVisible(false);
+ progressBar->hide();
+
+ QVBoxLayout *mainLayout = new QVBoxLayout;
+ mainLayout->addLayout(libraryLayout);
+ mainLayout->addStretch();
+ mainLayout->addWidget(progressBar);
+ mainLayout->addLayout(bottomLayout);
+
+ QHBoxLayout * imgMainLayout = new QHBoxLayout;
+ QLabel * imgLabel = new QLabel(this);
+ QPixmap p(":/images/exportLibrary.png");
+ imgLabel->setPixmap(p);
+ imgMainLayout->addWidget(imgLabel);
+ imgMainLayout->addLayout(mainLayout);
+
+ setLayout(imgMainLayout);
+
+ setModal(true);
+ setWindowTitle(tr("Create covers package"));
+ t.setInterval(500);
+ connect(&t,SIGNAL(timeout()),this,SLOT(updateProgress()));
+}
+
+void ExportLibraryDialog::exportLibrary()
+{
+ progressBar->show();
+ accept->setEnabled(false);
+ emit exportPath(QDir::cleanPath(path->text()));
+ t.start();
+}
+
+void ExportLibraryDialog::findPath()
+{
+ QString s = QFileDialog::getExistingDirectory(0,tr("Destination directory"),".");
+ if(!s.isEmpty())
+ {
+ path->setText(s);
+ accept->setEnabled(true);
+ }
+}
+
+void ExportLibraryDialog::close()
+{
+ path->clear();
+ progressBar->hide();
+ accept->setEnabled(false);
+ t.stop();
+ progressCount=0;
+ QDialog::close();
+}
+
+void ExportLibraryDialog::run()
+{
+
+}
+
diff --git a/YACReaderLibrary/export_library_dialog.h b/YACReaderLibrary/export_library_dialog.h
new file mode 100644
index 00000000..cfc73b1b
--- /dev/null
+++ b/YACReaderLibrary/export_library_dialog.h
@@ -0,0 +1,36 @@
+#ifndef EXPORT_LIBRARY_DIALOG_H
+#define EXPORT_LIBRARY_DIALOG_H
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+class ExportLibraryDialog : public QDialog
+{
+ Q_OBJECT
+public:
+ ExportLibraryDialog(QWidget * parent = 0);
+public slots:
+ void exportLibrary();
+ void findPath();
+ void close();
+private:
+ int progressCount;
+ QProgressBar *progressBar;
+ QLabel * textLabel;
+ QLineEdit * path;
+ QPushButton * find;
+ QPushButton * accept;
+ QPushButton * cancel;
+ void run();
+ QTimer t;
+signals:
+ void exportPath(QString);
+};
+
+#endif
\ No newline at end of file
diff --git a/YACReaderLibrary/files.qrc b/YACReaderLibrary/files.qrc
new file mode 100644
index 00000000..42bce93f
--- /dev/null
+++ b/YACReaderLibrary/files.qrc
@@ -0,0 +1,13 @@
+
+
+ ../files/about.html
+ ../files/helpYACReaderLibrary.html
+ ./yacreaderlibrary_es.qm
+
+
+
+ ../files/about_es_ES.html
+ ../files/helpYACReaderLibrary_es_ES.html
+
+
+
diff --git a/YACReaderLibrary/icon.ico b/YACReaderLibrary/icon.ico
new file mode 100644
index 00000000..b2232648
Binary files /dev/null and b/YACReaderLibrary/icon.ico differ
diff --git a/YACReaderLibrary/icon.rc b/YACReaderLibrary/icon.rc
new file mode 100644
index 00000000..afe5a14f
--- /dev/null
+++ b/YACReaderLibrary/icon.rc
@@ -0,0 +1,2 @@
+IDI_ICON1 ICON DISCARDABLE "icon.ico"
+IDI_ICON2 ICON DISCARDABLE "icon2.ico"
\ No newline at end of file
diff --git a/YACReaderLibrary/icon2.ico b/YACReaderLibrary/icon2.ico
new file mode 100644
index 00000000..e8777842
Binary files /dev/null and b/YACReaderLibrary/icon2.ico differ
diff --git a/YACReaderLibrary/images.qrc b/YACReaderLibrary/images.qrc
new file mode 100644
index 00000000..92ef8e47
--- /dev/null
+++ b/YACReaderLibrary/images.qrc
@@ -0,0 +1,41 @@
+
+
+ ../images/deleteLibrary.png
+ ../images/folder.png
+ ../images/help.png
+ ../images/icon.png
+ ../images/new.png
+ ../images/openLibrary.png
+ ../images/removeLibrary.png
+ ../images/updateLibrary.png
+ ../images/setRoot.png
+ ../images/expand.png
+ ../images/colapse.png
+ ../images/comicFolder.png
+ ../images/notCover.png
+ ../images/edit.png
+ ../images/fit.png
+ ../images/properties.png
+ ../images/options.png
+ ../images/flow1.png
+ ../images/flow2.png
+ ../images/flow3.png
+ ../images/importLibrary.png
+ ../images/exportLibrary.png
+ ../images/open.png
+ ../images/coversPackage.png
+ ../images/setRead.png
+ ../images/setAllRead.png
+ ../images/setUnread.png
+ ../images/setAllUnread.png
+ ../images/showMarks.png
+ ../images/importCover.png
+ ../images/editComic.png
+ ../images/selectAll.png
+ ../images/hideComicFlow.png
+ ../images/exportComicsInfo.png
+ ../images/importComicsInfo.png
+ ../images/db.png
+ ../images/asignNumber.png
+
+
\ No newline at end of file
diff --git a/YACReaderLibrary/import_comics_info_dialog.cpp b/YACReaderLibrary/import_comics_info_dialog.cpp
new file mode 100644
index 00000000..ae240c70
--- /dev/null
+++ b/YACReaderLibrary/import_comics_info_dialog.cpp
@@ -0,0 +1,111 @@
+#include "import_comics_info_dialog.h"
+
+#include
+#include
+#include
+#include
+
+#include "data_base_management.h"
+
+ImportComicsInfoDialog::ImportComicsInfoDialog(QWidget *parent)
+ : QDialog(parent)
+{
+ setModal(true);
+ setWindowTitle(tr("Import comics info"));
+
+
+ textLabel = new QLabel(tr("Info database location : "));
+ path = new QLineEdit;
+ textLabel->setBuddy(path);
+
+ accept = new QPushButton(tr("Import"));
+ accept->setDisabled(true);
+ connect(accept,SIGNAL(clicked()),this,SLOT(import()));
+
+ cancel = new QPushButton(tr("Cancel"));
+ connect(cancel,SIGNAL(clicked()),this,SLOT(close()));
+ //connect(cancel,SIGNAL(clicked()),this,SIGNAL(rejected()));
+
+ find = new QPushButton(QIcon(":/images/coversPackage.png"),"");
+ connect(find,SIGNAL(clicked()),this,SLOT(findPath()));
+
+ QHBoxLayout *libraryLayout = new QHBoxLayout;
+
+ libraryLayout->addWidget(textLabel);
+ libraryLayout->addWidget(path);
+ libraryLayout->addWidget(find);
+ libraryLayout->setStretchFactor(find,0); //TODO
+
+ progressBar = new QProgressBar(this);
+ progressBar->setMinimum(0);
+ progressBar->setMaximum(0);
+ progressBar->setTextVisible(false);
+ progressBar->hide();
+ connect(accept,SIGNAL(progressBar()),this,SLOT(show()));
+
+ QHBoxLayout *bottomLayout = new QHBoxLayout;
+ bottomLayout->addStretch();
+ bottomLayout->addWidget(accept);
+ bottomLayout->addWidget(cancel);
+
+ QVBoxLayout *mainLayout = new QVBoxLayout;
+ mainLayout->addLayout(libraryLayout);
+ mainLayout->addStretch();
+ mainLayout->addWidget(progressBar);
+ mainLayout->addLayout(bottomLayout);
+
+ QHBoxLayout * imgMainLayout = new QHBoxLayout;
+ QLabel * imgLabel = new QLabel(this);
+ QPixmap p(":/images/importComicsInfo.png");
+ imgLabel->setPixmap(p);
+ imgMainLayout->addWidget(imgLabel);
+ imgMainLayout->addLayout(mainLayout);
+
+ setLayout(imgMainLayout);
+
+ setModal(true);
+}
+
+ImportComicsInfoDialog::~ImportComicsInfoDialog()
+{
+
+}
+
+
+void ImportComicsInfoDialog::findPath()
+{
+ QString s = QFileDialog::getOpenFileName(0,"Comics Info",".",tr("Comics info file (*.ydb)"));
+ if(!s.isEmpty())
+ {
+ path->setText(s);
+ accept->setEnabled(true);
+ }
+}
+
+void ImportComicsInfoDialog::import()
+{
+ progressBar->show();
+
+ Importer * importer = new Importer();
+ importer->source = path->text();
+ importer->dest = dest;
+ connect(importer,SIGNAL(finished()),this,SLOT(close()));
+ connect(importer,SIGNAL(finished()),this,SLOT(hide()));
+ importer->start();
+}
+
+void ImportComicsInfoDialog::close()
+{
+ path->clear();
+ progressBar->hide();
+ accept->setDisabled(true);
+ QDialog::close();
+ emit(finished(0));
+}
+
+void Importer::run()
+{
+ DataBaseManagement::importComicsInfo(source,dest);
+}
+
+
diff --git a/YACReaderLibrary/import_comics_info_dialog.h b/YACReaderLibrary/import_comics_info_dialog.h
new file mode 100644
index 00000000..edc5e85e
--- /dev/null
+++ b/YACReaderLibrary/import_comics_info_dialog.h
@@ -0,0 +1,52 @@
+#ifndef IMPORT_COMICS_INFO_DIALOG_H
+#define IMPORT_COMICS_INFO_DIALOG_H
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+class Importer : public QThread
+{
+public:
+ QString source;
+ QString dest;
+private:
+ void run();
+};
+
+class ImportComicsInfoDialog : public QDialog
+{
+ Q_OBJECT
+
+public:
+ ImportComicsInfoDialog(QWidget *parent = 0);
+ ~ImportComicsInfoDialog();
+ QString dest;
+
+private:
+ QLabel * nameLabel;
+ QLabel * textLabel;
+ QLabel * destLabel;
+ QLineEdit * path;
+ QLineEdit * destPath;
+ QLineEdit * nameEdit;
+ QPushButton * find;
+ QPushButton * findDest;
+ QPushButton * accept;
+ QPushButton * cancel;
+ QLabel * progress;
+ void setupUI();
+ int progressCount;
+ QProgressBar *progressBar;
+
+public slots:
+ void findPath();
+ void import();
+ void close();
+};
+
+#endif // IMPORT_COMICS_INFO_DIALOG_H
diff --git a/YACReaderLibrary/import_library_dialog.cpp b/YACReaderLibrary/import_library_dialog.cpp
new file mode 100644
index 00000000..ad38fd1e
--- /dev/null
+++ b/YACReaderLibrary/import_library_dialog.cpp
@@ -0,0 +1,144 @@
+#include "import_library_dialog.h"
+
+#include
+#include
+#include
+#include
+
+
+ImportLibraryDialog::ImportLibraryDialog(QWidget * parent)
+:QDialog(parent),progressCount(0)
+{
+ setupUI();
+}
+
+void ImportLibraryDialog::setupUI()
+{
+ nameLabel = new QLabel(tr("Library Name : "));
+ nameEdit = new QLineEdit;
+ nameLabel->setBuddy(nameEdit);
+ connect(nameEdit,SIGNAL(textChanged(QString)),this,SLOT(nameEntered()));
+
+ textLabel = new QLabel(tr("Package location : "));
+ path = new QLineEdit;
+ textLabel->setBuddy(path);
+
+ destLabel = new QLabel(tr("Destination folder : "));
+ destPath = new QLineEdit;
+ textLabel->setBuddy(destPath);
+
+ accept = new QPushButton(tr("Unpack"));
+ accept->setDisabled(true);
+ connect(accept,SIGNAL(clicked()),this,SLOT(add()));
+
+ cancel = new QPushButton(tr("Cancel"));
+ connect(cancel,SIGNAL(clicked()),this,SLOT(close()));
+ //connect(cancel,SIGNAL(clicked()),this,SIGNAL(rejected()));
+
+ find = new QPushButton(QIcon(":/images/coversPackage.png"),"");
+ connect(find,SIGNAL(clicked()),this,SLOT(findPath()));
+
+ findDest = new QPushButton(QIcon(":/images/open.png"),"");
+ connect(findDest,SIGNAL(clicked()),this,SLOT(findDestination()));
+
+ QGridLayout * content = new QGridLayout;
+
+ content->addWidget(nameLabel,0,0);
+ content->addWidget(nameEdit,0,1);
+
+ content->addWidget(textLabel,1,0);
+ content->addWidget(path,1,1);
+ content->addWidget(find,1,2);
+ content->setColumnStretch(2,0); //TODO
+
+ content->addWidget(destLabel,2,0);
+ content->addWidget(destPath,2,1);
+ content->addWidget(findDest,2,2);
+ //destLayout->setStretchFactor(findDest,0); //TODO
+
+ QHBoxLayout *bottomLayout = new QHBoxLayout;
+ bottomLayout->addStretch();
+ bottomLayout->addWidget(accept);
+ bottomLayout->addWidget(cancel);
+
+ progressBar = new QProgressBar(this);
+ progressBar->setMinimum(0);
+ progressBar->setMaximum(0);
+ progressBar->setTextVisible(false);
+ progressBar->hide();
+
+ QVBoxLayout *mainLayout = new QVBoxLayout;
+ mainLayout->addLayout(content);
+ //mainLayout->addWidget(progress = new QLabel());
+ mainLayout->addStretch();
+ mainLayout->addWidget(progressBar);
+ mainLayout->addLayout(bottomLayout);
+
+ QHBoxLayout * imgMainLayout = new QHBoxLayout;
+ QLabel * imgLabel = new QLabel(this);
+ QPixmap p(":/images/importLibrary.png");
+ imgLabel->setPixmap(p);
+ imgMainLayout->addWidget(imgLabel);
+ imgMainLayout->addLayout(mainLayout);
+
+ setLayout(imgMainLayout);
+
+ setModal(true);
+ setWindowTitle(tr("Extract a catalog"));
+}
+
+void ImportLibraryDialog::add()
+{
+ accept->setEnabled(false);
+ progressBar->show();
+ emit(unpackCLC(QDir::cleanPath(path->text()),QDir::cleanPath(destPath->text()),nameEdit->text()));
+}
+
+void ImportLibraryDialog::findPath()
+{
+ QString s = QFileDialog::getOpenFileName(0,"Covers Package",".",tr("Compresed library covers (*.clc)"));
+ if(!s.isEmpty())
+ {
+ path->setText(s);
+ if(!destPath->text().isEmpty() && !nameEdit->text().isEmpty())
+ accept->setEnabled(true);
+ }
+}
+
+
+void ImportLibraryDialog::findDestination()
+{
+ QString s = QFileDialog::getExistingDirectory(0,"Folder",".",QFileDialog::ShowDirsOnly);
+ if(!s.isEmpty())
+ {
+ destPath->setText(s);
+ if(!path->text().isEmpty() && !nameEdit->text().isEmpty())
+ accept->setEnabled(true);
+ }
+}
+
+void ImportLibraryDialog::nameEntered()
+{
+ if(!nameEdit->text().isEmpty())
+ {
+ if(!path->text().isEmpty() && !destPath->text().isEmpty())
+ accept->setEnabled(true);
+ }
+ else
+ accept->setEnabled(false);
+}
+
+void ImportLibraryDialog::close()
+{
+ path->clear();
+ destPath->clear();
+ nameEdit->clear();
+ accept->setEnabled(false);
+ progressBar->hide();
+ QDialog::hide();
+}
+
+void ImportLibraryDialog::closeEvent ( QCloseEvent * e )
+{
+ close();
+}
diff --git a/YACReaderLibrary/import_library_dialog.h b/YACReaderLibrary/import_library_dialog.h
new file mode 100644
index 00000000..7c4f9305
--- /dev/null
+++ b/YACReaderLibrary/import_library_dialog.h
@@ -0,0 +1,43 @@
+#ifndef IMPORT_LIBRARY_DIALOG_H
+#define IMPORT_LIBRARY_DIALOG_H
+
+
+#include
+#include
+#include
+#include
+#include
+#include
+
+ class ImportLibraryDialog : public QDialog
+ {
+ Q_OBJECT
+ public:
+ ImportLibraryDialog(QWidget * parent = 0);
+ private:
+ QLabel * nameLabel;
+ QLabel * textLabel;
+ QLabel * destLabel;
+ QLineEdit * path;
+ QLineEdit * destPath;
+ QLineEdit * nameEdit;
+ QPushButton * find;
+ QPushButton * findDest;
+ QPushButton * accept;
+ QPushButton * cancel;
+ QProgressBar *progressBar;
+ void setupUI();
+ int progressCount;
+ void closeEvent ( QCloseEvent * e );
+ public slots:
+ void add();
+ void findPath();
+ void findDestination();
+ void close();
+ void nameEntered();
+
+ signals:
+ void unpackCLC(QString clc,QString targetFolder, QString name);
+ };
+
+#endif
diff --git a/YACReaderLibrary/library_creator.cpp b/YACReaderLibrary/library_creator.cpp
new file mode 100644
index 00000000..8a4e1d88
--- /dev/null
+++ b/YACReaderLibrary/library_creator.cpp
@@ -0,0 +1,487 @@
+#include "library_creator.h"
+#include "custom_widgets.h"
+
+#include
+#include
+#include
+#include
+#include "data_base_management.h"
+#include "qnaturalsorting.h"
+
+#include
+using namespace std;
+
+//QMutex mutex;
+
+
+
+/*int numThreads = 0;
+QWaitCondition waitCondition;
+QMutex mutex;
+*/
+
+
+//--------------------------------------------------------------------------------
+LibraryCreator::LibraryCreator()
+{
+ _nameFilter << "*.cbr" << "*.cbz" << "*.rar" << "*.zip" << "*.tar";
+}
+
+void LibraryCreator::createLibrary(const QString &source, const QString &target)
+{
+ processLibrary(source,target);
+}
+
+void LibraryCreator::updateLibrary(const QString &source, const QString &target)
+{
+ processLibrary(source,target);
+}
+
+void LibraryCreator::processLibrary(const QString & source, const QString & target)
+{
+ _source = source;
+ _target = target;
+ //if(!(QFile(target+"/library.ydb").exists())) //TODO, no sirve slo con realizar el update, hay que validar la base de datos y determinar si existe "/covers"
+ if(DataBaseManagement::checkValidDB(target+"/library.ydb")=="")
+ {
+ //se limpia el directorio ./yacreaderlibrary
+ delTree(target);
+ _mode = CREATOR;
+ }
+ else
+ _mode = UPDATER;
+}
+
+
+//
+void LibraryCreator::run()
+{
+ stopRunning = false;
+
+ if(_mode == CREATOR)
+ {
+ _currentPathFolders.clear();
+ _currentPathFolders.append(Folder(1,1,"root","/"));
+ //se crean los directorios .yacreaderlibrary y .yacreaderlibrary/covers
+ QDir dir;
+ dir.mkpath(_target+"/covers");
+
+ //se crea la base de datos .yacreaderlibrary/library.ydb
+ _database = DataBaseManagement::createDatabase("library",_target);//
+ /*if(!_database.open())
+ return; //TODO avisar del problema
+
+ QSqlQuery pragma("PRAGMA foreign_keys = ON",_database);*/
+ _database.transaction();
+ //se crea la librera
+ create(QDir(_source));
+ _database.commit();
+ _database.close();
+ QSqlDatabase::removeDatabase(_database.connectionName());
+ emit(created());
+ }
+ else
+ {
+ _currentPathFolders.clear();
+ _currentPathFolders.append(Folder(1,1,"root","/"));
+ _database = DataBaseManagement::loadDatabase(_target);
+ //_database.setDatabaseName(_target+"/library.ydb");
+ /*if(!_database.open())
+ return; //TODO avisar del problema*/
+ //QSqlQuery pragma("PRAGMA foreign_keys = ON",_database);
+ _database.transaction();
+ update(QDir(_source));
+ _database.commit();
+ _database.close();
+ QSqlDatabase::removeDatabase(_target);
+ emit(updated());
+ }
+ msleep(100);//TODO try to solve the problem with the udpate dialog
+ emit(finished());
+}
+
+void LibraryCreator::stop()
+{
+ _database.commit(); //TODO check
+ stopRunning = true;
+}
+
+//retorna el id del ultimo de los folders
+qulonglong LibraryCreator::insertFolders()
+{
+ QList::iterator i;
+ int currentId = 0;
+ for (i = _currentPathFolders.begin(); i != _currentPathFolders.end(); ++i)
+ {
+ if(!(i->knownId))
+ {
+ i->setFather(currentId);
+ currentId = i->insert(_database);//insertFolder(currentId,*i);
+ i->setId(currentId);
+ }
+ else
+ {
+ currentId = i->id;
+ }
+ }
+ return 0;
+}
+
+/*qulonglong LibraryCreator::insertFolder(qulonglong parentId,const Folder & folder)
+{
+ QSqlQuery query(_database);
+ query.prepare("INSERT INTO folder (parentId, name, path) "
+ "VALUES (:parentId, :name, :path)");
+ query.bindValue(":parentId", parentId);
+ query.bindValue(":name", folder.name);
+ query.bindValue(":path", folder.path);
+ query.exec();
+ return query.lastInsertId().toULongLong();
+}*/
+
+/*qulonglong LibraryCreator::insertComic(const Comic & comic)
+{
+ //TODO comprobar si ya hay comic info con ese hash
+ QSqlQuery comicInfoInsert(_database);
+ comicInfoInsert.prepare("INSERT INTO comic_info (hash) "
+ "VALUES (:hash)");
+ comicInfoInsert.bindValue(":hash", comic.hash);
+ comicInfoInsert.exec();
+ qulonglong comicInfoId =comicInfoInsert.lastInsertId().toULongLong();
+
+ QSqlQuery query(_database);
+ query.prepare("INSERT INTO comic (parentId, comicInfoId, fileName, path) "
+ "VALUES (:parentId,:comicInfoId,:name, :path)");
+ query.bindValue(":parentId", comic.parentId);
+ query.bindValue(":comicInfoId", comicInfoId);
+ query.bindValue(":name", comic.name);
+ query.bindValue(":path", comic.path);
+ query.exec();
+ return query.lastInsertId().toULongLong();
+}*/
+
+void LibraryCreator::create(QDir dir)
+{
+ dir.setNameFilters(_nameFilter);
+ dir.setFilter(QDir::AllDirs|QDir::Files|QDir::NoDotAndDotDot);
+ QFileInfoList list = dir.entryInfoList();
+ for (int i = 0; i < list.size(); ++i)
+ {
+ if(stopRunning)
+ return;
+ QFileInfo fileInfo = list.at(i);
+ QString fileName = fileInfo.fileName();
+ QString relativePath = QDir::cleanPath(fileInfo.absoluteFilePath()).remove(_source);
+ if(fileInfo.isDir())
+ {
+ //se aade al path actual el folder, an no se sabe si habr que aadirlo a la base de datos
+ _currentPathFolders.append(Folder(fileInfo.fileName(),relativePath));
+ create(QDir(fileInfo.absoluteFilePath()));
+ //una vez importada la informacin del folder, se retira del path actual ya que no volver a ser visitado
+ _currentPathFolders.pop_back();
+ }
+ else
+ {
+ insertComic(relativePath,fileInfo);
+ }
+ }
+}
+
+bool LibraryCreator::checkCover(const QString & hash)
+{
+ return QFile::exists(_target+"/covers/"+hash+".jpg");
+}
+
+void LibraryCreator::insertComic(const QString & relativePath,const QFileInfo & fileInfo)
+{
+ //en este punto sabemos que todos los folders que hay en _currentPath, deberan estar aadidos a la base de datos
+ insertFolders();
+ emit(coverExtracted(relativePath));
+
+ //Se calcula el hash del cmic
+
+ QCryptographicHash crypto(QCryptographicHash::Sha1);
+ QFile file(fileInfo.absoluteFilePath());
+ file.open(QFile::ReadOnly);
+ crypto.addData(file.read(524288));
+ file.close();
+ //hash Sha1 del primer 0.5MB + filesize
+ QString hash = QString(crypto.result().toHex().constData()) + QString::number(fileInfo.size());
+ Comic comic(_currentPathFolders.last().id,fileInfo.fileName(),relativePath,hash,_database);
+ int numPages;
+
+ if(! ( comic.hasCover() && checkCover(hash)))
+ {
+ ThumbnailCreator tc(QDir::cleanPath(fileInfo.absoluteFilePath()),_target+"/covers/"+hash+".jpg",*comic.info.coverPage);
+ //ThumbnailCreator tc(QDir::cleanPath(fileInfo.absoluteFilePath()),_target+"/covers/"+fileInfo.fileName()+".jpg");
+ tc.create();
+ numPages = tc.getNumPages();
+ }
+ comic.info.setNumPages(numPages);
+ comic.insert(_database);
+}
+
+void LibraryCreator::update(QDir dirS)
+{
+ dirS.setNameFilters(_nameFilter);
+ dirS.setFilter(QDir::AllDirs|QDir::Files|QDir::NoDotAndDotDot);
+ dirS.setSorting(QDir::Name|QDir::IgnoreCase|QDir::LocaleAware|QDir::DirsFirst); //TODO la ordenacin debe ser igual que en la base de datos
+ //TODO obtener primero los directorios, despus los ficheros, ordenar por separado y concatenar
+ QFileInfoList listS = dirS.entryInfoList();
+
+ QList folders = Folder::getFoldersFromParent(_currentPathFolders.last().id,_database);
+ QList comics = Comic::getComicsFromParent(_currentPathFolders.last().id,_database);
+
+ QList listD;
+ listD.append(folders);
+ listD.append(comics);
+
+ int lenghtS = listS.size();
+ int lenghtD = listD.size();
+ int maxLenght = qMax(lenghtS,lenghtD);
+
+ bool updated;
+ int i,j;
+ for (i=0,j=0; (i < lenghtS)||(j < lenghtD);)
+ {
+ if(stopRunning)
+ return;
+ updated = false;
+ if(i>=lenghtS) //finished source files/dirs
+ {
+ //delete listD //from j
+ for(;jremoveFromDB(_database);
+ }
+ updated = true;
+ }
+ if(j>=lenghtD) //finished library files/dirs
+ {
+ //create listS //from i
+ for(;iname;
+
+ int comparation = QString::localeAwareCompare(nameS,nameD);
+ if(fileInfoS.isDir()&&fileInfoD->isDir())
+ if(comparation == 0)//same folder, update
+ {
+ _currentPathFolders.append(*static_cast(fileInfoD));//fileInfoD conoce su padre y su id
+ update(QDir(fileInfoS.absoluteFilePath()));
+ _currentPathFolders.pop_back();
+ i++;
+ j++;
+ }
+ else
+ if(comparation < 0) //nameS doesn't exist on DB
+ {
+ if(nameS!="/.yacreaderlibrary")
+ {
+ _currentPathFolders.append(Folder(fileInfoS.fileName(),QDir::cleanPath(fileInfoS.absoluteFilePath()).remove(_source)));
+ create(QDir(fileInfoS.absoluteFilePath()));
+ _currentPathFolders.pop_back();
+ }
+ i++;
+ }
+ else //nameD no longer avaliable on Source folder...
+ {
+ if(nameS!="/.yacreaderlibrary")
+ {
+ fileInfoD->removeFromDB(_database);
+ j++;
+ }
+ else
+ i++; //skip library directory
+ }
+ else // one of them(or both) is a file
+ if(fileInfoS.isDir()) //this folder doesn't exist on library
+ {
+ if(nameS!="/.yacreaderlibrary") //skip .yacreaderlibrary folder
+ {
+ _currentPathFolders.append(Folder(fileInfoS.fileName(),QDir::cleanPath(fileInfoS.absoluteFilePath()).remove(_source)));
+ create(QDir(fileInfoS.absoluteFilePath()));
+ _currentPathFolders.pop_back();
+ }
+ i++;
+ }
+ else
+ if(fileInfoD->isDir()) //delete this folder from library
+ {
+ fileInfoD->removeFromDB(_database);
+ j++;
+ }
+ else //both are files //BUG on windows (no case sensitive)
+ {
+ //nameD.remove(nameD.size()-4,4);
+ int comparation = QString::localeAwareCompare(nameS,nameD);
+ if(comparation < 0) //create new thumbnail
+ {
+ insertComic(QDir::cleanPath(fileInfoS.absoluteFilePath()).remove(_source),fileInfoS);
+ i++;
+ }
+ else
+ {
+ if(comparation > 0) //delete thumbnail
+ {
+ fileInfoD->removeFromDB(_database);
+ j++;
+ }
+ else //same file
+ {
+ if(fileInfoS.isFile() && !fileInfoD->isDir())
+ {
+ //TODO comprobar fechas + tamao
+ //if(fileInfoS.lastModified()>fileInfoD.lastModified())
+ //{
+ // dirD.mkpath(_target+(QDir::cleanPath(fileInfoS.absolutePath()).remove(_source)));
+ // emit(coverExtracted(QDir::cleanPath(fileInfoS.absoluteFilePath()).remove(_source)));
+ // ThumbnailCreator tc(QDir::cleanPath(fileInfoS.absoluteFilePath()),_target+(QDir::cleanPath(fileInfoS.absoluteFilePath()).remove(_source))+".jpg");
+ // tc.create();
+ //}
+ }
+ i++;j++;
+ }
+ }
+ }
+ }
+ }
+}
+ThumbnailCreator::ThumbnailCreator(QString fileSource, QString target="", int coverPage)
+:_fileSource(fileSource),_target(target),_numPages(0),_coverPage(coverPage)
+{
+}
+
+void ThumbnailCreator::create()
+{
+ _7z = new QProcess();
+ QStringList attributes;
+ attributes << "l" << "-ssc-" << "-r" << _fileSource << "*.jpg" << "*.jpeg" << "*.png" << "*.gif" << "*.tiff" << "*.tif" << "*.bmp";
+ //connect(_7z,SIGNAL(finished(int,QProcess::ExitStatus)),this,SLOT(loadFirstImage(void)));
+ connect(_7z,SIGNAL(error(QProcess::ProcessError)),this,SIGNAL(openingError(QProcess::ProcessError)));
+ _7z->start(QCoreApplication::applicationDirPath()+"/utils/7z",attributes);
+ _7z->waitForFinished(60000);
+
+ QRegExp rx("[0-9]{4}-[0-9]{2}-[0-9]{2}[ ]+[0-9]{2}:[0-9]{2}:[0-9]{2}[ ]+.{5}[ ]+([0-9]+)[ ]+([0-9]+)[ ]+(.+)");
+
+ QString ba = QString::fromUtf8(_7z->readAllStandardOutput());
+ QList lines = ba.split('\n');
+ QString line;
+ _currentName = "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ"; //TODO
+ QString name;
+ if(_coverPage == 1)
+ {
+ foreach(line,lines)
+ {
+ if(rx.indexIn(line)!=-1)
+ {
+ name = rx.cap(3).trimmed();
+ if(naturalSortLessThanCI(name,_currentName))
+ _currentName = name;
+ _numPages++;
+ }
+ }
+ }
+ else
+ {
+ QList names;
+ foreach(line,lines)
+ {
+ if(rx.indexIn(line)!=-1)
+ {
+ name = rx. cap(3).trimmed();
+ names.append(name);
+ }
+ }
+ std::sort(names.begin(),names.end(),naturalSortLessThanCI);
+ _currentName = names[_coverPage-1];
+ }
+ delete _7z;
+ attributes.clear();
+ _currentName = QDir::fromNativeSeparators(_currentName).split('/').last(); //separator fixed.
+#ifdef Q_WS_WIN
+ attributes << "e" << "-so" << "-r" << _fileSource << QString(_currentName.toLocal8Bit().constData()); //TODO platform dependency?? OEM 437
+#else
+ attributes << "e" << "-so" << "-r" << _fileSource << _currentName; //TODO platform dependency?? OEM 437
+#endif
+ _7z = new QProcess();
+ connect(_7z,SIGNAL(error(QProcess::ProcessError)),this,SIGNAL(openingError(QProcess::ProcessError)));
+ //connect(_7z,SIGNAL(finished(int,QProcess::ExitStatus)),this,SLOT(writeThumbnail(void)));
+ _7z->start(QCoreApplication::applicationDirPath()+"/utils/7z",attributes);
+ _7z->waitForFinished(60000);
+
+ QByteArray image = _7z->readAllStandardOutput();
+ QString error = _7z->readAllStandardError();
+ QImage p;
+ if(_target=="")
+ {
+ if(!_cover.loadFromData(image))
+ _cover.load(":/images/notCover.png");
+ }
+ else
+ {
+ if(p.loadFromData(image))
+ {
+ //TODO calculate aspect ratio
+ QImage scaled;
+ if(p.width()>p.height()) //landscape??
+ scaled = p.scaledToWidth(640,Qt::SmoothTransformation);
+ else
+ scaled = p.scaledToWidth(480,Qt::SmoothTransformation);
+ scaled.save(_target,0,75);
+ }
+ else
+ {
+ p.load(":/images/notCover.png");
+ p.save(_target);
+ //TODO save a default image.
+ }
+ }
+ delete _7z;
+}
+
+/*void ThumbnailCreator::openingError(QProcess::ProcessError error)
+{
+ //TODO : move to the gui thread
+ switch(error)
+ {
+ case QProcess::FailedToStart:
+ QMessageBox::critical(NULL,tr("7z not found"),tr("7z wasn't found in your PATH."));
+ break;
+ case QProcess::Crashed:
+ QMessageBox::critical(NULL,tr("7z crashed"),tr("7z crashed."));
+ break;
+ case QProcess::ReadError:
+ QMessageBox::critical(NULL,tr("7z reading"),tr("problem reading from 7z"));
+ break;
+ case QProcess::UnknownError:
+ QMessageBox::critical(NULL,tr("7z problem"),tr("Unknown error 7z"));
+ break;
+ default:
+ //TODO
+ break;
+ }
+}*/
diff --git a/YACReaderLibrary/library_creator.h b/YACReaderLibrary/library_creator.h
new file mode 100644
index 00000000..dedd7043
--- /dev/null
+++ b/YACReaderLibrary/library_creator.h
@@ -0,0 +1,81 @@
+#ifndef __LIBRARY_CREATOR_H
+#define __LIBRARY_CREATOR_H
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "folder.h"
+#include "comic.h"
+
+
+ class LibraryCreator : public QThread
+ {
+ Q_OBJECT
+ public:
+ LibraryCreator();
+ void createLibrary(const QString & source, const QString & target);
+ void updateLibrary(const QString & source, const QString & target);
+ void stop();
+ private:
+ void processLibrary(const QString & source, const QString & target);
+ enum Mode {CREATOR,UPDATER};
+ //atributos "globales" durante el proceso de creacin y actualizacin
+ enum Mode _mode;
+ QString _source;
+ QString _target;
+ QStringList _nameFilter;
+ QSqlDatabase _database;
+ QList _currentPathFolders; //lista de folders en el orden en el que estn siendo explorados, el ltimo es el folder actual
+ //recursive method
+ void create(QDir currentDirectory);
+ void update(QDir currentDirectory);
+ void run();
+ qulonglong insertFolders();//devuelve el id del ltimo folder aadido (ltimo en la ruta)
+ bool checkCover(const QString & hash);
+ void insertComic(const QString & relativePath,const QFileInfo & fileInfo);
+ //qulonglong insertFolder(qulonglong parentId,const Folder & folder);
+ //qulonglong insertComic(const Comic & comic);
+ bool stopRunning;
+ signals:
+ void finished();
+ void coverExtracted(QString);
+ void folderUpdated(QString);
+ void updated();
+ void created();
+ };
+
+ class ThumbnailCreator : public QObject
+ {
+ Q_OBJECT
+
+ public:
+ ThumbnailCreator(QString fileSource, QString target, int coverPage = 1);
+ private:
+ QProcess * _7z;
+ QString _fileSource;
+ QString _target;
+ QString _currentName;
+ int _numPages;
+ QPixmap _cover;
+ int _coverPage;
+
+ public slots:
+ void create();
+ int getNumPages(){return _numPages;};
+ QPixmap getCover(){return _cover;};
+ signals:
+ void openingError(QProcess::ProcessError error);
+
+ };
+
+#endif
diff --git a/YACReaderLibrary/library_window.cpp b/YACReaderLibrary/library_window.cpp
new file mode 100644
index 00000000..3d80075d
--- /dev/null
+++ b/YACReaderLibrary/library_window.cpp
@@ -0,0 +1,1328 @@
+#include "library_window.h"
+#include "custom_widgets.h"
+#include "treeitem.h"
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include