mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-06-04 01:28:55 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

yacreader_ru.ts

Browse Source 
Correcting errors in words and their meanings. Update the Russian language. Now look better.
This commit is contained in:
Anon789 2018-02-24 18:11:53 +00:00
commit dd381df7b7
1048 changed files with 104539 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

205
CHANGELOG.md Normal file
View File

@ -0,0 +1,205 @@
# YACReader Changelog
Please note: this is a work in progress. Keeping a changelog has been neglected
in the past so information is missing and older release information is in
spanish only. Sorry for the mess.
## 9.0.0 (2018-2-18)
### Library and Reader
* Updated Qt to 5.9.1.
* Faster (way faster) pdf backend based on pdfium.
* unarr is used now for handling compressed files (there are some temporal side
effects: f.e. 7z is not supported). YACReader can still be compiled using 7zip
as decompresion library.
* Fixed fullscreen context menus (windows).
* Minor fixes.
* New app icons for Windows.
* Initial support for Haiku OS
### YACReaderLibrary
* New comics view in addition to flow and grid views: info view.
* New side view for showing current comic info in the grid view
(it can be shown using the icon in the right bottom part of the window).
* Improved the look and feel of the grid view.
* Fixed Comic Vine integration (using the new https end point).
* Usability fixes to Comic View scraper.
* Fixed UI update when clients update comics status.
* New server setting for disabling covers on folders in the client's remote
browser (iOS), this is a workaround to fix a performance issue in large
libraries.
* Fixed YACReader not found in macos.
### YACReader
* Added an option to disable showing the go to flow on mouse over.
* New "Quick Navigation Mode" for the go to flow feature, full-wide + a scroll
bar, it can be enabled in the settings dialog. (thanks to Yuu Mousou).
* Zig-zag autoscroll reading mode, please see the reading section in the
shortcuts dialog for enabling this, by default there are no keys assigned to
the scrolling actions (thanks to Daisuke Cato).
* Menu bar added for YACReader in macos (thanks to Daisuke Cato).
* "Go to flow" is now manga aware (thanks to Daisuke Cato).
* Added "Open recent" menu entry.
* Fixed issues experienced when opening new comics too fast
### YACReaderLibraryServer (headless version of YACReaderLibrary)
* Added a systemd service file to run yacreaderlibraryserver on Linux based systems.
## 8.5.0 - 2016-03-28
* headless version of YACReaderLibrary's server (no gui)
* grid view has been enhanced with a new slider for choosing covers size
and it also includes a fully configurable background that can use
the covers of your comics. Now every single folder will have a unique look.
* YACReader UI has been refreshed with a cleaner look.
* New fit and zoom modes, finally!.
* open recent functionality
## 8.0.0
* Reading lists
* Tags
* 'Favorites' and 'being read' lists
* New search engine, now you can filter folders and comics
* New grid viewb
* Add and delete folders
* Update a single folder (no need for updating the whole library to rescan a single folder)
* Drag and drop for adding new comics and folders
* Customizable shorcuts
* Manga mode (thank you Felix)
* Spread page detection for double page mode (including manga mode)(thank you again Felix :) )
* New view for folders not containing comics (only subfolders)
* Save selected covers to disk
* Comics in Reading Lists and Tags can be sorted by drag&drop
* Sublist in Reading Lists can by sorted by drag&drop
* Added WebP image format support
* The user has to provide its own Comic Vine API key to prevent usage limit errors from Comic Vine
* New unarr decompression backend for Linux and Unix systems
* Fixed memory and filedescriptor leaks in 7zip wrapper
* Dropped support for Qt4
* Lots of smaller bugfixes
## 7.2.0
* Added support for the new "remote read" feature in iOS devices.
* Improved stability
* Fixed broken compatibility with Windows XP
* Improved Linux "packageability" (thanks to Felix, Alexander and Yoann)**
* German translation (thanks to Gerhard Joeken)
* Bug fixes.
## 7.1.0
* A<>adida opci<63>n para resetear el rating de un comics
* Corregidos bugs que afectaban a la informaci<63>n de p<>gina.
* Corregido error que marcaba un comic terminado como empezado si se volv<6C>a a leer.
* A<>adidos 2 estados para las carpetas (Completo/Terminado)
* Corregido bug en la comunicaci<63>n YACReaderLibrary <-> YACReader
* A<>adidas las acciones relativas a los comics al men<65> contextual de la tabla de c<>mics.
* Corrgido bug que provocaba el crecimiento ilimatado del log del servidor
* Corregidos bugs menores
7.0.2 (S<>lo MacOSX)
* Eliminado el uso de Poppler en la versi<73>n de MacOSX
* Trabajo en traducciones.
* Corregidos bugs menores
7.0.1
* A<>adido QsLog a YACReader
* Corregido bug en la comunicaci<63>n YACReaderLibrary <-> YACReader
7.0 (Final)
* Corregidos eventos de teclado en algunos di<64>logos
* Corregido soporte para archivos Rar en sistemas Unix
* Corregidos problemas borrando c<>mics
* Mejorada la gesti<74>n de errores
* Corregida la comunicaci<63>n entre YACReader y YACReaderLibrary
* Corregida la toolBar en MacOSX
* Mejorada la compatabilidad de OpenGL en tarjetas NVIDIA
* Corregidos bugs menores
## 6.9 - (No p<>blica)
* A<>adida la apertura autom<6F>tica del siguiente/anterior c<>mic al llegar al final/portada del c<>mic actual
* Corregido el comportamiento del di<64>logo de nueva versi<73>n detectada. Ahora avisa una vez al d<>a o si el usuario lo elige cada 14 d<>as.
* Corregido el ajuste a lo ancho del t<>tulo de la toolbar en YACReaderLibrary.
* A<>adido log a YACReaderLibrary (permitir<69> a los usuarios ofrecer m<>s informaci<63>n sobre sus bugs)
* Corregido bug en el historial de navegaci<63>n (y al editar comics) despu<70>s de usar el motor de b<>squeda.
## 6.8 - (No p<>blica)
* Corregido bug que causaba un cierre inesperado despu<70>s de cambiar el modo de sincronizaci<63>n vertical (flow)
* Corregido bug que causaba que la toolbar en el visor no se pudiese ocultar/mostrar sin un c<>mic abierto
* Mejorada la gesti<74>n de errores al abrir c<>mics
* Corregidos algunos bugs relacionados con la apertura de c<>mics
* A<>adida funci<63>n de rating
* El visor ahora puede abrir archivos de imagen directamente. Si se abre un archivo de imagen se abre el directorio que lo contiene con todas las im<69>genes.
* Corregida la ordenaci<63>n de carpetas y c<>mics usada en la navegaci<63>n desde dispositivos iOS
## 6.7 - (No p<>blica)
* A<>adidos nuevos campos en la base de datos para almacenar informaci<63>n adicional sobre c<>mics: rating, p<>gina actual, bookmarks y configuraci<63>n de imagen
* A<>adida comunicaci<63>n entre YACReaderLibrary y YACReader para poder almacenar el progreso de los c<>mics e informaci<63>n adicional
## 6.6 - (No p<>blica)
* Modificado YACReader para que abra los archivos comprimidos usando 7z.dll (.so, .dylib)
* YACReader abre ahora los c<>mics por la <20>ltima p<>gina le<6C>da.
* Corregido bug que causaba que algunos c<>mics no se pudiesen abrir desde * YACReaderLibrary en YACReader
* Corregido el modo en el que se actualizaba la "information label"
## 6.5
* Nueva interfaz principal de YACReaderLibrary y YACReader
* Corregido bug que causaba que el servidor no se activase en el primer arranque en MacOSX
* Corregido bug que causaba un fallo al cerrar YACReaderLibrary cada vez que se usaba el servidor
* Nuevo dise<73>o para el di<64>logo de propiedades de los c<>mics.
* A<>adida navegaci<63>n alante y atr<74>s de las carpetas visitadas.
* La edici<63>n del nombre de una biblioteca no fuerza ahora que se recargue la biblioteca
* Corregido el color de fondo en la lupa
* Nuevo bot<6F>n para ajustar a lo alto
* Eliminada la opci<63>n always on top
* Mostrar en carpeta contenedora arreglado en Windows y MacOSX
## 6.4 - (No p<>blica)
Normalizado el renderizado de p<>ginas en modo doble p<>gina
A<EFBFBD>adida la funci<63>n de borrar c<>mics desde el disco duro
Nuevos iconos de la barra de herramientas de c<>mics
## 6.3 (No p<>blica)
* Mejorada la gesti<74>n de errores relacionada con las bibliotecas
* A<>adido bot<6F>n que permite ocultar las portadas en la pantalla de importaci<63>n
* A<>adidos t<>tulos "Bibliotecas" y "Carpetas" a la barra de navegaci<63>n
* Nuevos iconos para seleccionar la carpeta ra<72>z, expandir y contraer todos.
* Bot<6F>n para cambiar el puerto del servidor por el usuario.
* Ahora las columnas de la lista de c<>mics pueden reordenarse
* Ahora YACReaderLibrary s<>lo permite una instancia ejecutandose.
* Columna le<6C>do a<>adida.
* Cambiado estilo de la lista de c<>mics
* Corregidos bugs relacionados con realizar operaciones sobre c<>mics cuando no hab<61>a ninguno seleccionado en la lista de c<>mics
## 6.2
* Nueva ventana de "bienvenida"
* Nueva ventana de importar/actualizar
* Nuevo control para la b<>squeda
* Nueva imagen para las marcas de c<>mics le<6C>dos (s<>lo en OpenGL)
* Cambiada la distribuci<63>n de algunos iconos
* Cambiado el modo de eliminar la metainformaci<63>n (borrar base de datos/portadas de disco)
* Ocultadas las opciones avanzadas de configuraci<63>n de YACReader Flow, accesibles ahora tras pulsar un bot<6F>n (di<64>logos de configuraci<63>n m<>s simples)
## 6.0.1 - (No p<>blica)
* Corregido bug al usar las teclas Inicio/fin
* Corregido bug que al arrancar YACReaderLibrary por primera vez causaba que no se * mostrasen las portadas (s<>lo bajo ciertas circunstancias)
* A<>adidos algunos atajos de teclado a YACReaderLibrary a los ya existentes
## 6.0
* Mejorada la velocidad de inicio gracias al uso de /LTCG como opci<63>n de compilaci<63>n
* Corregido bug relacionado con OpenGL que causaba consumo excesivo de CPU en tarjetas NVidia
* A<>adidos iconos para cada tipo de archivo soportado en YACReaderLibrary
* Cambiado el icono "folder" en YACReaderLibrary
* A<>adida barra para ajustar el ancho de p<>gina en la toolbar de YACReader
* A<>adido widget para la information label
* A<>adido nuevo estilo visual a goToFlow
* A<>adidos filtros para controlar el brillo, el contraste y el valor gamma
* A<>adidas notificaciones de portada y <20>ltima p<>gina
* InformationLabel se muestra ahora en la esquina superiror derecha.
* InformationLabel se muestra en 3 tama<6D>os diferentes en funci<63>n de la resoluci<63>n
* Corregido bug que causaba que las marcas de c<>mic le<6C>do no se dibujasen adecuadamente.
* Se recuerda si se debe mostrar o no la "label" informaci<63>n.
* Corregido bug que provocaba el fallo de YACReader al pasar muy r<>pido las p<>ginas.
* A<>adida columna "Tama<6D>o" a la lista de c<>mics en YACReaderLibrary
* A<>adida la ordinaci<63>n "natural" de los comics que hay en directorio del c<>mic actual.
* Corregido bug que causaba que se abriese el c<>mic erroneo en YACReaderLibrary.
* Cambiado el modo en el que se cargan los lenguages, ahora se pueden a<>adir traducciones sin necesidad de recompilar.

674
COPYING.txt Normal file
View File

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

111
INSTALL.md Normal file
View File

@ -0,0 +1,111 @@
# Building YACReader from source
YACReader and YACReaderLibrary are build using qmake. To build and install the
program, run:
> qmake-qt5 CONFIG+=[Options]
> make
> make install
from the source dir. For separate builds of YACReader or YACReaderLibrary,
enter their respective subfolders and run the commands from there.
The headless version of YACReaderLibrary is located in the YACReaderLibraryServer
folder. To build it, enter the folder and run the commands described above.
## Build dependencies:
- Qt >= 5.6 with the following modules:
- declarative
- quickcontrols
- sql
- script
- multimedia
- imageformats
- opengl
- sql-sqlite
- network
- A pdf rendering backend (optional, see below)
- qrencode (optional)
- glu
- (lib)unarr (see below)
Not all dependencies are needed at build time. For example the qml components in
YACReaderLibrary (GridView, InfoView) will only show a white page if the
required qml modules (declarative, quickcontrols) are missing.
This can also happen if these dependencies are too old (i.e Qt < 5.6 is used).
## Backends
### Decompression
YACReader uses [(lib)unarr](https://github.com/selmf/unarr) for comic book archive
decompression. Most Linux distributions don't ship this library yet, so you will
probably have to build it yourself.
We recommend using (lib)unarr as a shared library, but we also support static
and embedded builds. Please consult the [README](compressed_archive/unarr/README.txt)
for more information on this topic.
### PDF
Starting with version 9.0.0 YACReader supports the following pdf render engines:
- poppler (Linux/Unix default)
- pdfium (default for Windows and MacOS)
- pdfkit (MacOS only)
- no_pdf (disable pdf support)
To override the default for a given platform add CONFIG+=[pdfbackend] as an option
when running qmake.
While the Poppler backend is well tested and has been the standard for YACReader
for a long time, it's performance is a bit lacking. The pdfium engine offers
much better performance (about 10x faster on some pdf files we tested).
However, at the time of this writing, it is not a library that is available
prepackaged for Linux.
### Other build options:
You can adjust the installation prefix as well als the path "make install" uses
to install the files.
>qmake PREFIX=DIR
sets the default prefix (for example "/", "/usr", "/usr/local").
>make install INSTALL_ROOT=DIR
can be used to install to a different location, which is usefull for packaging.
Default values:
>PREFIX=/usr
>INSTALL_ROOT=""
On embedded devices that don't support desktop OpenGL, it is recommended to use
the no_opengl config option:
qmake-qt5 CONFIG+=no_opengl
This will remove any dependency on desktop OpenGL and hardlock YACReader's
coverflow to software rendering. Please note that it does not actually remove
OpenGL from the build, the Qt toolkit will still make use of it.
# Feedback and contribution
If you're compiling YACReader because there is no package available for your
Linux distribution please consider creating and submitting a package or filing a
package request.
While we do provide packages for .deb and .rpm based distributions as well as an
AUR package for Archlinux and it's derivates, we are in need of downstream packagers
that are willing to make YACReader available as a standard package for their distro.
If you are interested, please contact @selmf on the YACReader forums or write
an email to info@yacreader.com
If you have already created a package please let us know so we can add it to
our downloads list ;)

249
QsLog/QsLog.cpp Normal file
View File

@ -0,0 +1,249 @@
// Copyright (c) 2013, Razvan Petru
// All rights reserved.
// 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.
// * The name of the contributors may not 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 HOLDER 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.
#include "QsLog.h"
#include "QsLogDest.h"
#ifdef QS_LOG_SEPARATE_THREAD
#include <QThreadPool>
#include <QRunnable>
#endif
#include <QMutex>
#include <QVector>
#include <QDateTime>
#include <QtGlobal>
#include <cassert>
#include <cstdlib>
#include <stdexcept>
namespace QsLogging
{
typedef QVector<DestinationPtr> DestinationList;
static const char TraceString[] = "TRACE";
static const char DebugString[] = "DEBUG";
static const char InfoString[] = "INFO ";
static const char WarnString[] = "WARN ";
static const char ErrorString[] = "ERROR";
static const char FatalString[] = "FATAL";
// not using Qt::ISODate because we need the milliseconds too
static const QString fmtDateTime("yyyy-MM-ddThh:mm:ss.zzz");
static Logger* sInstance = 0;
static const char* LevelToText(Level theLevel)
{
switch (theLevel) {
case TraceLevel:
return TraceString;
case DebugLevel:
return DebugString;
case InfoLevel:
return InfoString;
case WarnLevel:
return WarnString;
case ErrorLevel:
return ErrorString;
case FatalLevel:
return FatalString;
case OffLevel:
return "";
default: {
assert(!"bad log level");
return InfoString;
}
}
}
#ifdef QS_LOG_SEPARATE_THREAD
class LogWriterRunnable : public QRunnable
{
public:
LogWriterRunnable(QString message, Level level);
virtual void run();
private:
QString mMessage;
Level mLevel;
};
#endif
class LoggerImpl
{
public:
LoggerImpl();
#ifdef QS_LOG_SEPARATE_THREAD
QThreadPool threadPool;
#endif
QMutex logMutex;
Level level;
DestinationList destList;
};
#ifdef QS_LOG_SEPARATE_THREAD
LogWriterRunnable::LogWriterRunnable(QString message, Level level)
: QRunnable()
, mMessage(message)
, mLevel(level)
{
}
void LogWriterRunnable::run()
{
Logger::instance().write(mMessage, mLevel);
}
#endif
LoggerImpl::LoggerImpl()
: level(InfoLevel)
{
// assume at least file + console
destList.reserve(2);
#ifdef QS_LOG_SEPARATE_THREAD
threadPool.setMaxThreadCount(1);
threadPool.setExpiryTimeout(-1);
#endif
}
Logger::Logger()
: d(new LoggerImpl)
{
}
Logger& Logger::instance()
{
if (!sInstance)
sInstance = new Logger;
return *sInstance;
}
void Logger::destroyInstance()
{
delete sInstance;
sInstance = 0;
}
// tries to extract the level from a string log message. If available, conversionSucceeded will
// contain the conversion result.
Level Logger::levelFromLogMessage(const QString& logMessage, bool* conversionSucceeded)
{
if (conversionSucceeded)
*conversionSucceeded = true;
if (logMessage.startsWith(QLatin1String(TraceString)))
return TraceLevel;
if (logMessage.startsWith(QLatin1String(DebugString)))
return DebugLevel;
if (logMessage.startsWith(QLatin1String(InfoString)))
return InfoLevel;
if (logMessage.startsWith(QLatin1String(WarnString)))
return WarnLevel;
if (logMessage.startsWith(QLatin1String(ErrorString)))
return ErrorLevel;
if (logMessage.startsWith(QLatin1String(FatalString)))
return FatalLevel;
if (conversionSucceeded)
*conversionSucceeded = false;
return OffLevel;
}
Logger::~Logger()
{
#ifdef QS_LOG_SEPARATE_THREAD
d->threadPool.waitForDone();
#endif
delete d;
d = 0;
}
void Logger::addDestination(DestinationPtr destination)
{
assert(destination.data());
d->destList.push_back(destination);
}
void Logger::setLoggingLevel(Level newLevel)
{
d->level = newLevel;
}
Level Logger::loggingLevel() const
{
return d->level;
}
//! creates the complete log message and passes it to the logger
void Logger::Helper::writeToLog()
{
const char* const levelName = LevelToText(level);
const QString completeMessage(QString("%1 %2 %3")
.arg(levelName)
.arg(QDateTime::currentDateTime().toString(fmtDateTime))
.arg(buffer)
);
Logger::instance().enqueueWrite(completeMessage, level);
}
Logger::Helper::~Helper()
{
try {
writeToLog();
}
catch(std::exception&) {
// you shouldn't throw exceptions from a sink
assert(!"exception in logger helper destructor");
//CHANGED throw;
}
}
//! directs the message to the task queue or writes it directly
void Logger::enqueueWrite(const QString& message, Level level)
{
#ifdef QS_LOG_SEPARATE_THREAD
LogWriterRunnable *r = new LogWriterRunnable(message, level);
d->threadPool.start(r);
#else
write(message, level);
#endif
}
//! Sends the message to all the destinations. The level for this message is passed in case
//! it's useful for processing in the destination.
void Logger::write(const QString& message, Level level)
{
QMutexLocker lock(&d->logMutex);
for (DestinationList::iterator it = d->destList.begin(),
endIt = d->destList.end();it != endIt;++it) {
(*it)->write(message, level);
}
}
} // end namespace

137
QsLog/QsLog.h Normal file
View File

@ -0,0 +1,137 @@
// Copyright (c) 2013, Razvan Petru
// All rights reserved.
// 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.
// * The name of the contributors may not 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 HOLDER 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.
#ifndef QSLOG_H
#define QSLOG_H
#include "QsLogLevel.h"
#include "QsLogDest.h"
#include <QDebug>
#include <QString>
#define QS_LOG_VERSION "2.0b3"
namespace QsLogging
{
class Destination;
class LoggerImpl; // d pointer
class QSLOG_SHARED_OBJECT Logger
{
public:
static Logger& instance();
static void destroyInstance();
static Level levelFromLogMessage(const QString& logMessage, bool* conversionSucceeded = 0);
~Logger();
//! Adds a log message destination. Don't add null destinations.
void addDestination(DestinationPtr destination);
//! Logging at a level < 'newLevel' will be ignored
void setLoggingLevel(Level newLevel);
//! The default level is INFO
Level loggingLevel() const;
//! The helper forwards the streaming to QDebug and builds the final
//! log message.
class QSLOG_SHARED_OBJECT Helper
{
public:
explicit Helper(Level logLevel) :
level(logLevel),
qtDebug(&buffer) {}
~Helper();
QDebug& stream(){ return qtDebug; }
private:
void writeToLog();
Level level;
QString buffer;
QDebug qtDebug;
};
private:
Logger();
Logger(const Logger&); // not available
Logger& operator=(const Logger&); // not available
void enqueueWrite(const QString& message, Level level);
void write(const QString& message, Level level);
LoggerImpl* d;
friend class LogWriterRunnable;
};
} // end namespace
//! Logging macros: define QS_LOG_LINE_NUMBERS to get the file and line number
//! in the log output.
#ifndef QS_LOG_LINE_NUMBERS
#define QLOG_TRACE() \
if (QsLogging::Logger::instance().loggingLevel() > QsLogging::TraceLevel) {} \
else QsLogging::Logger::Helper(QsLogging::TraceLevel).stream()
#define QLOG_DEBUG() \
if (QsLogging::Logger::instance().loggingLevel() > QsLogging::DebugLevel) {} \
else QsLogging::Logger::Helper(QsLogging::DebugLevel).stream()
#define QLOG_INFO() \
if (QsLogging::Logger::instance().loggingLevel() > QsLogging::InfoLevel) {} \
else QsLogging::Logger::Helper(QsLogging::InfoLevel).stream()
#define QLOG_WARN() \
if (QsLogging::Logger::instance().loggingLevel() > QsLogging::WarnLevel) {} \
else QsLogging::Logger::Helper(QsLogging::WarnLevel).stream()
#define QLOG_ERROR() \
if (QsLogging::Logger::instance().loggingLevel() > QsLogging::ErrorLevel) {} \
else QsLogging::Logger::Helper(QsLogging::ErrorLevel).stream()
#define QLOG_FATAL() \
if (QsLogging::Logger::instance().loggingLevel() > QsLogging::FatalLevel) {} \
else QsLogging::Logger::Helper(QsLogging::FatalLevel).stream()
#else
#define QLOG_TRACE() \
if (QsLogging::Logger::instance().loggingLevel() > QsLogging::TraceLevel) {} \
else QsLogging::Logger::Helper(QsLogging::TraceLevel).stream() << __FILE__ << '@' << __LINE__
#define QLOG_DEBUG() \
if (QsLogging::Logger::instance().loggingLevel() > QsLogging::DebugLevel) {} \
else QsLogging::Logger::Helper(QsLogging::DebugLevel).stream() << __FILE__ << '@' << __LINE__
#define QLOG_INFO() \
if (QsLogging::Logger::instance().loggingLevel() > QsLogging::InfoLevel) {} \
else QsLogging::Logger::Helper(QsLogging::InfoLevel).stream() << __FILE__ << '@' << __LINE__
#define QLOG_WARN() \
if (QsLogging::Logger::instance().loggingLevel() > QsLogging::WarnLevel) {} \
else QsLogging::Logger::Helper(QsLogging::WarnLevel).stream() << __FILE__ << '@' << __LINE__
#define QLOG_ERROR() \
if (QsLogging::Logger::instance().loggingLevel() > QsLogging::ErrorLevel) {} \
else QsLogging::Logger::Helper(QsLogging::ErrorLevel).stream() << __FILE__ << '@' << __LINE__
#define QLOG_FATAL() \
if (QsLogging::Logger::instance().loggingLevel() > QsLogging::FatalLevel) {} \
else QsLogging::Logger::Helper(QsLogging::FatalLevel).stream() << __FILE__ << '@' << __LINE__
#endif
#ifdef QS_LOG_DISABLE
#include "QsLogDisableForThisFile.h"
#endif
#endif // QSLOG_H

22
QsLog/QsLog.pri Normal file
View File

@ -0,0 +1,22 @@
INCLUDEPATH += $$PWD
#DEFINES += QS_LOG_LINE_NUMBERS # automatically writes the file and line for each log message
#DEFINES += QS_LOG_DISABLE # logging code is replaced with a no-op
#DEFINES += QS_LOG_SEPARATE_THREAD # messages are queued and written from a separate thread
SOURCES += $$PWD/QsLogDest.cpp \
$$PWD/QsLog.cpp \
$$PWD/QsLogDestConsole.cpp \
$$PWD/QsLogDestFile.cpp \
$$PWD/QsLogDestFunctor.cpp
HEADERS += $$PWD/QSLogDest.h \
$$PWD/QsLog.h \
$$PWD/QsLogDestConsole.h \
$$PWD/QsLogLevel.h \
$$PWD/QsLogDestFile.h \
$$PWD/QsLogDisableForThisFile.h \
$$PWD/QsLogDestFunctor.h
OTHER_FILES += \
$$PWD/QsLogChanges.txt \
$$PWD/QsLogReadme.txt \
$$PWD/LICENSE.txt

70
QsLog/QsLogDest.cpp Normal file
View File

@ -0,0 +1,70 @@
// Copyright (c) 2013, Razvan Petru
// All rights reserved.
// 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.
// * The name of the contributors may not 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 HOLDER 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.
#include "QsLogDest.h"
#include "QsLogDestConsole.h"
#include "QsLogDestFile.h"
#include "QsLogDestFunctor.h"
#include <QString>
namespace QsLogging
{
Destination::~Destination()
{
}
//! destination factory
DestinationPtr DestinationFactory::MakeFileDestination(const QString& filePath,
LogRotationOption rotation, const MaxSizeBytes &sizeInBytesToRotateAfter,
const MaxOldLogCount &oldLogsToKeep)
{
if (EnableLogRotation == rotation) {
QScopedPointer<SizeRotationStrategy> logRotation(new SizeRotationStrategy);
logRotation->setMaximumSizeInBytes(sizeInBytesToRotateAfter.size);
logRotation->setBackupCount(oldLogsToKeep.count);
return DestinationPtr(new FileDestination(filePath, RotationStrategyPtr(logRotation.take())));
}
return DestinationPtr(new FileDestination(filePath, RotationStrategyPtr(new NullRotationStrategy)));
}
DestinationPtr DestinationFactory::MakeDebugOutputDestination()
{
return DestinationPtr(new DebugOutputDestination);
}
DestinationPtr DestinationFactory::MakeFunctorDestination(QsLogging::Destination::LogFunction f)
{
return DestinationPtr(new FunctorDestination(f));
}
DestinationPtr DestinationFactory::MakeFunctorDestination(QObject *receiver, const char *member)
{
return DestinationPtr(new FunctorDestination(receiver, member));
}
} // end namespace

99
QsLog/QsLogDest.h Normal file
View File

@ -0,0 +1,99 @@
// Copyright (c) 2013, Razvan Petru
// All rights reserved.
// 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.
// * The name of the contributors may not 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 HOLDER 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.
#ifndef QSLOGDEST_H
#define QSLOGDEST_H
#include "QsLogLevel.h"
#include <QSharedPointer>
#include <QtGlobal>
class QString;
class QObject;
#ifdef QSLOG_IS_SHARED_LIBRARY
#define QSLOG_SHARED_OBJECT Q_DECL_EXPORT
#elif QSLOG_IS_SHARED_LIBRARY_IMPORT
#define QSLOG_SHARED_OBJECT Q_DECL_IMPORT
#else
#define QSLOG_SHARED_OBJECT
#endif
namespace QsLogging
{
class QSLOG_SHARED_OBJECT Destination
{
public:
typedef void (*LogFunction)(const QString &message, Level level);
public:
virtual ~Destination();
virtual void write(const QString& message, Level level) = 0;
virtual bool isValid() = 0; // returns whether the destination was created correctly
};
typedef QSharedPointer<Destination> DestinationPtr;
// a series of "named" paramaters, to make the file destination creation more readable
enum LogRotationOption
{
DisableLogRotation = 0,
EnableLogRotation = 1
};
struct QSLOG_SHARED_OBJECT MaxSizeBytes
{
MaxSizeBytes() : size(0) {}
explicit MaxSizeBytes(qint64 size_) : size(size_) {}
qint64 size;
};
struct QSLOG_SHARED_OBJECT MaxOldLogCount
{
MaxOldLogCount() : count(0) {}
explicit MaxOldLogCount(int count_) : count(count_) {}
int count;
};
//! Creates logging destinations/sinks. The caller shares ownership of the destinations with the logger.
//! After being added to a logger, the caller can discard the pointers.
class QSLOG_SHARED_OBJECT DestinationFactory
{
public:
static DestinationPtr MakeFileDestination(const QString& filePath,
LogRotationOption rotation = DisableLogRotation,
const MaxSizeBytes &sizeInBytesToRotateAfter = MaxSizeBytes(),
const MaxOldLogCount &oldLogsToKeep = MaxOldLogCount());
static DestinationPtr MakeDebugOutputDestination();
// takes a pointer to a function
static DestinationPtr MakeFunctorDestination(Destination::LogFunction f);
// takes a QObject + signal/slot
static DestinationPtr MakeFunctorDestination(QObject *receiver, const char *member);
};
} // end namespace
#endif // QSLOGDEST_H

55
QsLog/QsLogDestConsole.cpp Normal file
View File

@ -0,0 +1,55 @@
// Copyright (c) 2013, Razvan Petru
// All rights reserved.
// 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.
// * The name of the contributors may not 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 HOLDER 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.
#include "QsLogDestConsole.h"
#include <QString>
#include <QtGlobal>
#if defined(Q_OS_WIN)
#define WIN32_LEAN_AND_MEAN
#include <Windows.h>
void QsDebugOutput::output( const QString& message )
{
OutputDebugStringW(reinterpret_cast<const WCHAR*>(message.utf16()));
OutputDebugStringW(L"\n");
}
#elif defined(Q_OS_UNIX)
#include <cstdio>
void QsDebugOutput::output( const QString& message )
{
fprintf(stderr, "%s\n", qPrintable(message));
fflush(stderr);
}
#endif
void QsLogging::DebugOutputDestination::write(const QString& message, Level)
{
QsDebugOutput::output(message);
}
bool QsLogging::DebugOutputDestination::isValid()
{
return true;
}

52
QsLog/QsLogDestConsole.h Normal file
View File

@ -0,0 +1,52 @@
// Copyright (c) 2013, Razvan Petru
// All rights reserved.
// 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.
// * The name of the contributors may not 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 HOLDER 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.
#ifndef QSLOGDESTCONSOLE_H
#define QSLOGDESTCONSOLE_H
#include "QsLogDest.h"
class QString;
class QsDebugOutput
{
public:
static void output(const QString& a_message);
};
namespace QsLogging
{
// debugger sink
class DebugOutputDestination : public Destination
{
public:
virtual void write(const QString& message, Level level);
virtual bool isValid();
};
}
#endif // QSLOGDESTCONSOLE_H

155
QsLog/QsLogDestFile.cpp Normal file
View File

@ -0,0 +1,155 @@
// Copyright (c) 2013, Razvan Petru
// All rights reserved.
// 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.
// * The name of the contributors may not 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 HOLDER 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.
#include "QsLogDestFile.h"
#include <QTextCodec>
#include <QDateTime>
#include <QtGlobal>
#include <iostream>
const int QsLogging::SizeRotationStrategy::MaxBackupCount = 10;
QsLogging::RotationStrategy::~RotationStrategy()
{
}
QsLogging::SizeRotationStrategy::SizeRotationStrategy()
: mCurrentSizeInBytes(0)
, mMaxSizeInBytes(0)
, mBackupsCount(0)
{
}
void QsLogging::SizeRotationStrategy::setInitialInfo(const QFile &file)
{
mFileName = file.fileName();
mCurrentSizeInBytes = file.size();
}
void QsLogging::SizeRotationStrategy::includeMessageInCalculation(const QString &message)
{
mCurrentSizeInBytes += message.toUtf8().size();
}
bool QsLogging::SizeRotationStrategy::shouldRotate()
{
return mCurrentSizeInBytes > mMaxSizeInBytes;
}
// Algorithm assumes backups will be named filename.X, where 1 <= X <= mBackupsCount.
// All X's will be shifted up.
void QsLogging::SizeRotationStrategy::rotate()
{
if (!mBackupsCount) {
if (!QFile::remove(mFileName))
std::cerr << "QsLog: backup delete failed " << qPrintable(mFileName);
return;
}
// 1. find the last existing backup than can be shifted up
const QString logNamePattern = mFileName + QString::fromUtf8(".%1");
int lastExistingBackupIndex = 0;
for (int i = 1;i <= mBackupsCount;++i) {
const QString backupFileName = logNamePattern.arg(i);
if (QFile::exists(backupFileName))
lastExistingBackupIndex = qMin(i, mBackupsCount - 1);
else
break;
}
// 2. shift up
for (int i = lastExistingBackupIndex;i >= 1;--i) {
const QString oldName = logNamePattern.arg(i);
const QString newName = logNamePattern.arg(i + 1);
QFile::remove(newName);
const bool renamed = QFile::rename(oldName, newName);
if (!renamed) {
std::cerr << "QsLog: could not rename backup " << qPrintable(oldName)
<< " to " << qPrintable(newName);
}
}
// 3. rename current log file
const QString newName = logNamePattern.arg(1);
if (QFile::exists(newName))
QFile::remove(newName);
if (!QFile::rename(mFileName, newName)) {
std::cerr << "QsLog: could not rename log " << qPrintable(mFileName)
<< " to " << qPrintable(newName);
}
}
QIODevice::OpenMode QsLogging::SizeRotationStrategy::recommendedOpenModeFlag()
{
return QIODevice::Append;
}
void QsLogging::SizeRotationStrategy::setMaximumSizeInBytes(qint64 size)
{
Q_ASSERT(size >= 0);
mMaxSizeInBytes = size;
}
void QsLogging::SizeRotationStrategy::setBackupCount(int backups)
{
Q_ASSERT(backups >= 0);
mBackupsCount = qMin(backups, SizeRotationStrategy::MaxBackupCount);
}
QsLogging::FileDestination::FileDestination(const QString& filePath, RotationStrategyPtr rotationStrategy)
: mRotationStrategy(rotationStrategy)
{
mFile.setFileName(filePath);
if (!mFile.open(QFile::WriteOnly | QFile::Text | mRotationStrategy->recommendedOpenModeFlag()))
std::cerr << "QsLog: could not open log file " << qPrintable(filePath);
mOutputStream.setDevice(&mFile);
mOutputStream.setCodec(QTextCodec::codecForName("UTF-8"));
mRotationStrategy->setInitialInfo(mFile);
}
void QsLogging::FileDestination::write(const QString& message, Level)
{
mRotationStrategy->includeMessageInCalculation(message);
if (mRotationStrategy->shouldRotate()) {
mOutputStream.setDevice(NULL);
mFile.close();
mRotationStrategy->rotate();
if (!mFile.open(QFile::WriteOnly | QFile::Text | mRotationStrategy->recommendedOpenModeFlag()))
std::cerr << "QsLog: could not reopen log file " << qPrintable(mFile.fileName());
mRotationStrategy->setInitialInfo(mFile);
mOutputStream.setDevice(&mFile);
}
mOutputStream << message << endl;
mOutputStream.flush();
}
bool QsLogging::FileDestination::isValid()
{
return mFile.isOpen();
}

101
QsLog/QsLogDestFile.h Normal file
View File

@ -0,0 +1,101 @@
// Copyright (c) 2013, Razvan Petru
// All rights reserved.
// 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.
// * The name of the contributors may not 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 HOLDER 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.
#ifndef QSLOGDESTFILE_H
#define QSLOGDESTFILE_H
#include "QsLogDest.h"
#include <QFile>
#include <QTextStream>
#include <QtGlobal>
#include <QSharedPointer>
namespace QsLogging
{
class RotationStrategy
{
public:
virtual ~RotationStrategy();
virtual void setInitialInfo(const QFile &file) = 0;
virtual void includeMessageInCalculation(const QString &message) = 0;
virtual bool shouldRotate() = 0;
virtual void rotate() = 0;
virtual QIODevice::OpenMode recommendedOpenModeFlag() = 0;
};
// Never rotates file, overwrites existing file.
class NullRotationStrategy : public RotationStrategy
{
public:
virtual void setInitialInfo(const QFile &) {}
virtual void includeMessageInCalculation(const QString &) {}
virtual bool shouldRotate() { return false; }
virtual void rotate() {}
virtual QIODevice::OpenMode recommendedOpenModeFlag() { return QIODevice::Truncate; }
};
// Rotates after a size is reached, keeps a number of <= 10 backups, appends to existing file.
class SizeRotationStrategy : public RotationStrategy
{
public:
SizeRotationStrategy();
static const int MaxBackupCount;
virtual void setInitialInfo(const QFile &file);
virtual void includeMessageInCalculation(const QString &message);
virtual bool shouldRotate();
virtual void rotate();
virtual QIODevice::OpenMode recommendedOpenModeFlag();
void setMaximumSizeInBytes(qint64 size);
void setBackupCount(int backups);
private:
QString mFileName;
qint64 mCurrentSizeInBytes;
qint64 mMaxSizeInBytes;
int mBackupsCount;
};
typedef QSharedPointer<RotationStrategy> RotationStrategyPtr;
// file message sink
class FileDestination : public Destination
{
public:
FileDestination(const QString& filePath, RotationStrategyPtr rotationStrategy);
virtual void write(const QString& message, Level level);
virtual bool isValid();
private:
QFile mFile;
QTextStream mOutputStream;
QSharedPointer<RotationStrategy> mRotationStrategy;
};
}
#endif // QSLOGDESTFILE_H

57
QsLog/QsLogDestFunctor.cpp Normal file
View File

@ -0,0 +1,57 @@
// Copyright (c) 2014, Razvan Petru
// Copyright (c) 2014, Omar Carey
// All rights reserved.
// 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.
// * The name of the contributors may not 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 HOLDER 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.
#include "QsLogDestFunctor.h"
#include <cstddef>
#include <QtGlobal>
QsLogging::FunctorDestination::FunctorDestination(LogFunction f)
: QObject(NULL)
, mLogFunction(f)
{
}
QsLogging::FunctorDestination::FunctorDestination(QObject *receiver, const char *member)
: QObject(NULL)
, mLogFunction(NULL)
{
connect(this, SIGNAL(logMessageReady(QString,int)), receiver, member, Qt::QueuedConnection);
}
void QsLogging::FunctorDestination::write(const QString &message, QsLogging::Level level)
{
if (mLogFunction)
mLogFunction(message, level);
if (level > QsLogging::TraceLevel)
emit logMessageReady(message, static_cast<int>(level));
}
bool QsLogging::FunctorDestination::isValid()
{
return true;
}

59
QsLog/QsLogDestFunctor.h Normal file
View File

@ -0,0 +1,59 @@
// Copyright (c) 2014, Razvan Petru
// Copyright (c) 2014, Omar Carey
// All rights reserved.
// 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.
// * The name of the contributors may not 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 HOLDER 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.
#ifndef QSLOGDESTFUNCTOR_H
#define QSLOGDESTFUNCTOR_H
#include "QsLogDest.h"
#include <QObject>
namespace QsLogging
{
// Offers various types of function-like sinks.
// This is an advanced destination type. Depending on your configuration, LogFunction might be
// called from a different thread or even a different binary. You should not access QsLog from
// inside LogFunction and should not perform any time-consuming operations.
// logMessageReady is connected through a queued connection and trace messages are not included
class FunctorDestination : public QObject, public Destination
{
Q_OBJECT
public:
explicit FunctorDestination(LogFunction f);
FunctorDestination(QObject *receiver, const char *member);
virtual void write(const QString &message, Level level);
virtual bool isValid();
protected:
// int used to avoid registering a new enum type
Q_SIGNAL void logMessageReady(const QString &message, int level);
private:
LogFunction mLogFunction;
};
}
#endif // QSLOGDESTFUNCTOR_H

22
QsLog/QsLogDisableForThisFile.h Normal file
View File

@ -0,0 +1,22 @@
#ifndef QSLOGDISABLEFORTHISFILE_H
#define QSLOGDISABLEFORTHISFILE_H
#include <QtDebug>
// When included AFTER QsLog.h, this file will disable logging in that C++ file. When included
// before, it will lead to compiler warnings or errors about macro redefinitions.
#undef QLOG_TRACE
#undef QLOG_DEBUG
#undef QLOG_INFO
#undef QLOG_WARN
#undef QLOG_ERROR
#undef QLOG_FATAL
#define QLOG_TRACE() if (1) {} else qDebug()
#define QLOG_DEBUG() if (1) {} else qDebug()
#define QLOG_INFO() if (1) {} else qDebug()
#define QLOG_WARN() if (1) {} else qDebug()
#define QLOG_ERROR() if (1) {} else qDebug()
#define QLOG_FATAL() if (1) {} else qDebug()
#endif // QSLOGDISABLEFORTHISFILE_H

45
QsLog/QsLogLevel.h Normal file
View File

@ -0,0 +1,45 @@
// Copyright (c) 2013, Razvan Petru
// All rights reserved.
// 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.
// * The name of the contributors may not 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 HOLDER 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.
#ifndef QSLOGLEVEL_H
#define QSLOGLEVEL_H
namespace QsLogging
{
enum Level
{
TraceLevel = 0,
DebugLevel,
InfoLevel,
WarnLevel,
ErrorLevel,
FatalLevel,
OffLevel
};
}
#endif // QSLOGLEVEL_H

35
QsLog/QsLogSharedLibrary.pro Normal file
View File

@ -0,0 +1,35 @@
# This pro file will build QsLog as a shared library
include(QsLog.pri)
TARGET = QsLog
VERSION = "2.0.0"
QT -= gui
CONFIG -= console
CONFIG -= app_bundle
CONFIG += shared
TEMPLATE = lib
DESTDIR = $$PWD/build-QsLogShared
OBJECTS_DIR = $$DESTDIR/obj
MOC_DIR = $$DESTDIR/moc
win32 {
DEFINES += QSLOG_IS_SHARED_LIBRARY
}
unix:!macx {
# make install will install the shared object in the appropriate folders
headers.files = QsLog.h QsLogDest.h QsLogLevel.h
headers.path = /usr/include/$(QMAKE_TARGET)
other_files.files = *.txt
other_files.path = /usr/local/share/$(QMAKE_TARGET)
contains(QT_ARCH, x86_64) {
target.path = /usr/lib64
} else {
target.path = /usr/lib
}
INSTALLS += headers target other_files
}

22
README.txt Normal file
View File

@ -0,0 +1,22 @@
LICENSE
*******
This software has been developed by Luis Ángel San Martín Rodríguez (luisangelsm@gmail.com) under GPL v3 license
(for more details read COPYING.txt).
CONTACT
*******
Project home page : www.yacreader.com
e-mail:
info@yacreader.com
support@yacreader.com
Social:
Facebook - http://www.facebook.com/YACReader
Twitter - https://twitter.com/yacreader
YouTube - https://www.youtube.com/user/yacreader
If you need help or have any suggestion, please, send me an e-mail.
DONATIONS
*********
YACReader is free but it needs money to still be alive, so please,
if you like YACReader, visit the home page and make a donation.

50
YACReader.1 Normal file
View File

@ -0,0 +1,50 @@
.\" Manpage for YACReader.
.\" Contact yoann.gauthier9@gmail.com to correct errors or typos.
.TH man 1 "28 September 2014" "2.0" "YACReader man page"
.SH NAME
YACReader \- launch YACReader application.
.SH SYNOPSIS
YACReader [\fBFile\fR | \fBDirectory\fR]
.br
YACReader [\fB\-h\fR | \fB\-\-help\fR]
.br
YACReader [\fB\-v\fR | \fB\-\-version\fR]
.SH DESCRIPTION
YACReader is a free cross-platform comic reader with support for multiple comic files and image formats.
.SH OPTIONS
.TP
.BR File
Open comic file.
.TP
.BR Directory
Open comic directory.
.TP
.BR \-h, \-\- help
Display this text and exit.
.TP
.BR \-v, \-\- version
Display version information and exit.
.SH FEATURES
- rar, zip, cbr, cbz, tar and pdf comics support with compatibility for jpeg, gif, png, tiff, webp and bmp images.
.TP
- Fast and easy to use.
.TP
- Use your keyboard or mouse for easy navigation.
.TP
- Fully customizable magnifying glass.
.TP
- Image rotation, double page mode, full size view, fullscreen mode, customizable background color and more.
.TP
- Bookmarks and resume reading.
.TP
- Find any page easily and quickly with "go to flow", a customizable eye candy effect for browsing comic pages.
.SH CONTACTS
To report bug or contact developpers, send a mail to :
.RS 3
.TP
\fBinfo@yacreader.com\fR : for general information or suggestions about YACReader.
.TP
\fBsupport@yacreader.com\fR : for problems with YACReader or bugs detected.
.RE
.SH AUTHOR
Luis Ángel San Martín Rodríguez (luisangelsm@gmail.com)

13
YACReader.desktop Normal file
View File

@ -0,0 +1,13 @@
[Desktop Entry]
Name=YACReader
GenericName=Yet Another Comic Reader
Comment=A comic reader with support for .cb*, .pdf and whole directories.
Exec=YACReader %f
Icon=YACReader
Terminal=false
Type=Application
StartupNotify=true
Categories=Graphics;Viewer;
MimeType=application/x-cbz;application/x-cbr;application/x-cbt;application/x-cb7;application/x-pdf;application/x-zip;application/x-rar;application/x-7z;inode/directory;
Keywords=comic;viewer;pdf;reader;
X-Desktop-File-Install-Version=0.22

3
YACReader.pro Normal file
View File

@ -0,0 +1,3 @@
TEMPLATE = subdirs
SUBDIRS = YACReader YACReaderLibrary
YACReaderLibrary.depends = YACReader

262
YACReader.svg Normal file
View File

@ -0,0 +1,262 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
<style type="text/css">
.st0{clip-path:url(#SVGID_1_);fill:url(#SVGID_2_);}
.st1{fill:#FEFEFE;}
</style>
<g>
<defs>
<path id="SVGID_4_" d="M462,512H50c-27.6142368,0-50-22.3857727-50-50V50C0,22.3857632,22.3857632,0,50,0h412
c27.6142273,0,50,22.3857632,50,50v412C512,489.6142273,489.6142273,512,462,512z"/>
</defs>
<clipPath id="SVGID_1_">
<use xlink:href="#SVGID_4_" style="overflow:visible;"/>
</clipPath>
<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="256" y1="0" x2="256" y2="512">
<stop offset="0" style="stop-color:#F7D540"/>
<stop offset="1" style="stop-color:#F5A705"/>
</linearGradient>
<rect class="st0" width="512" height="512"/>
</g>
<g>
<image style="overflow:visible;opacity:0.3;" width="388" height="377" xlink:href="data:image/png;base64,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
0F8AAAAASUVORK5CYII=" transform="matrix(1 0 0 1 62 85)">
</image>
<g>
<path class="st1" d="M201.8427582,452.1990967c7.9529877-7.9224854,14.8448181-15.8196716,20.568222-24.5335999
c7.6417847-11.6346436,15.5732269-23.250824,17.0232544-37.7714539c0.5719299-5.7275085-0.914978-10.9725037-2.7538452-16.2418823
c-0.8058624-2.3092041-2.5366058-2.4479675-4.5341187-2.6282349c-20.7874908-1.8758545-41.6086426-3.4692688-62.3410034-5.8366699
c-16.2639618-1.8572083-32.8863678-3.163269-47.8207626-10.5712891
c-27.8042679-13.7919312-45.1182327-36.4577026-50.5798492-66.7850647
c-5.3831329-29.8915405-4.6855469-59.9107819,5.6421127-89.0243378
c6.3635483-17.938858,16.7360687-32.9733887,30.9389572-45.9541321
c16.009819-14.6321869,33.5399551-26.6509247,53.0207748-35.8248138
c23.1212158-10.8882523,47.6262054-17.5493622,72.7399597-21.8891144
c22.0135498-3.8040085,44.1688843-6.6821899,66.5804443-5.8223038
c32.0260925,1.2287674,62.6009216,8.1147385,90.0792236,25.3665314
c26.5435181,16.6649094,41.8272095,41.6059952,48.8744812,71.4110794
c8.0511169,34.0505829,5.7797546,68.059906-8.2308655,100.0966492
c-20.2964478,46.4100037-55.54953,75.4332581-106.0571899,84.5401001
c-3.2914429,0.5934448-5.4665527,1.7913818-7.5055847,4.3917236
c-15.0653992,19.2125549-31.6446838,36.9571838-51.2288513,51.7009277
c-12.2995148,9.259552-25.6989746,16.6385803-39.7042084,22.9464417
C219.0126953,453.1661682,211.1707458,454.3078003,201.8427582,452.1990967z"/>
</g>
</g>
<path class="st1" d="M201.8427582,452.1990967c7.9529877-7.9224854,14.8448181-15.8196716,20.568222-24.5335999
c7.6417847-11.6346436,15.5732269-23.250824,17.0232544-37.7714539c0.5719299-5.7275085-0.914978-10.9725037-2.7538452-16.2418823
c-0.8058624-2.3092041-2.5366058-2.4479675-4.5341187-2.6282349c-20.7874908-1.8758545-41.6086426-3.4692688-62.3410034-5.8366699
c-16.2639618-1.8572083-32.8863678-3.163269-47.8207626-10.5712891
c-27.8042679-13.7919312-45.1182327-36.4577026-50.5798492-66.7850647
c-5.3831329-29.8915405-4.6855469-59.9107819,5.6421127-89.0243378
c6.3635483-17.938858,16.7360687-32.9733887,30.9389572-45.9541321
c16.009819-14.6321869,33.5399551-26.6509247,53.0207748-35.8248138
c23.1212158-10.8882523,47.6262054-17.5493622,72.7399597-21.8891144
c22.0135498-3.8040085,44.1688843-6.6821899,66.5804443-5.8223038c32.0260925,1.2287674,62.6009216,8.1147385,90.0792236,25.3665314
c26.5435181,16.6649094,41.8272095,41.6059952,48.8744812,71.4110794
c8.0511169,34.0505829,5.7797546,68.059906-8.2308655,100.0966492
c-20.2964478,46.4100037-55.54953,75.4332581-106.0571899,84.5401001c-3.2914429,0.5934448-5.4665527,1.7913818-7.5055847,4.3917236
c-15.0653992,19.2125549-31.6446838,36.9571838-51.2288513,51.7009277
c-12.2995148,9.259552-25.6989746,16.6385803-39.7042084,22.9464417
C219.0126953,453.1661682,211.1707458,454.3078003,201.8427582,452.1990967z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 19 KiB

171
YACReader/Info.plist Normal file
View File

@ -0,0 +1,171 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
<key>CFBundleIconFile</key>
<string>YACReader.icns</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleGetInfoString</key>
<string>Created by Qt/QMake</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleExecutable</key>
<string>YACReader</string>
<key>CFBundleIdentifier</key>
<string>com.yacreader.YACReader</string>
<key>CFBundleDocumentTypes</key>
<array>
<dict>
<key>CFBundleTypeName</key>
<string>YACReader Comic rar</string>
<key>CFBundleTypeRole</key>
<string>Viewer</string>
<key>LSHandlerRank</key>
<string>Owner</string>
<key>LSItemContentTypes</key>
<array>
<string>com.yacreader.yacreader.rar</string>
</array>
</dict>
<dict>
<key>CFBundleTypeName</key>
<string>YACReader Comic zip</string>
<key>CFBundleTypeRole</key>
<string>Viewer</string>
<key>LSHandlerRank</key>
<string>Owner</string>
<key>LSItemContentTypes</key>
<array>
<string>com.yacreader.yacreader.zip</string>
</array>
</dict>
<dict>
<key>CFBundleTypeName</key>
<string>YACReader Comic cbr</string>
<key>CFBundleTypeRole</key>
<string>Viewer</string>
<key>LSHandlerRank</key>
<string>Owner</string>
<key>LSItemContentTypes</key>
<array>
<string>com.yacreader.yacreader.cbr</string>
</array>
</dict>
<dict>
<key>CFBundleTypeName</key>
<string>YACReader Comic cbz</string>
<key>CFBundleTypeRole</key>
<string>Viewer</string>
<key>LSHandlerRank</key>
<string>Owner</string>
<key>LSItemContentTypes</key>
<array>
<string>com.yacreader.yacreader.cbz</string>
</array>
</dict>
<dict>
<key>CFBundleTypeName</key>
<string>YACReader Comic pdf</string>
<key>CFBundleTypeRole</key>
<string>Viewer</string>
<key>LSHandlerRank</key>
<string>Owner</string>
<key>LSItemContentTypes</key>
<array>
<string>com.adobe.pdf</string>
</array>
</dict>
</array>
<key>UTExportedTypeDeclarations</key>
<array>
<dict>
<key>UTTypeConformsTo</key>
<array>
<string>public.data</string>
</array>
<key>UTTypeDescription</key>
<string>YACReader Comic</string>
<key>UTTypeIdentifier</key>
<string>com.yacreader.yacreader.rar</string>
<key>UTTypeTagSpecification</key>
<dict>
<key>public.filename-extension</key>
<string>rar</string>
<key>public.mime-type</key>
<string>application/comic-rar</string>
</dict>
</dict>
<dict>
<key>UTTypeConformsTo</key>
<array>
<string>public.data</string>
</array>
<key>UTTypeDescription</key>
<string>YACReader Comic</string>
<key>UTTypeIdentifier</key>
<string>com.yacreader.yacreader.zip</string>
<key>UTTypeTagSpecification</key>
<dict>
<key>public.filename-extension</key>
<string>zip</string>
<key>public.mime-type</key>
<string>application/comic-zip</string>
</dict>
</dict>
<dict>
<key>UTTypeConformsTo</key>
<array>
<string>public.data</string>
</array>
<key>UTTypeDescription</key>
<string>YACReader Comic</string>
<key>UTTypeIdentifier</key>
<string>com.yacreader.yacreader.cbr</string>
<key>UTTypeTagSpecification</key>
<dict>
<key>public.filename-extension</key>
<string>cbr</string>
<key>public.mime-type</key>
<string>application/comic-cbr</string>
</dict>
</dict>
<dict>
<key>UTTypeConformsTo</key>
<array>
<string>public.data</string>
</array>
<key>UTTypeDescription</key>
<string>YACReader Comic</string>
<key>UTTypeIdentifier</key>
<string>com.yacreader.yacreader.cbz</string>
<key>UTTypeTagSpecification</key>
<dict>
<key>public.filename-extension</key>
<string>cbz</string>
<key>public.mime-type</key>
<string>application/comic-cbz</string>
</dict>
</dict>
<dict>
<key>UTTypeConformsTo</key>
<array>
<string>public.data</string>
</array>
<key>UTTypeDescription</key>
<string>YACReader Comic</string>
<key>UTTypeIdentifier</key>
<string>com.yacreader.yacreader.pdf</string>
<key>UTTypeTagSpecification</key>
<dict>
<key>public.filename-extension</key>
<string>pdf</string>
<key>public.mime-type</key>
<string>application/comic-pdf</string>
</dict>
</dict>
</array>
</dict>
</plist>

BIN
YACReader/YACReader.icns Normal file
View File

Binary file not shown.

259
YACReader/YACReader.pro Normal file
View File

@ -0,0 +1,259 @@
TEMPLATE = app
TARGET = YACReader
QMAKE_TARGET_BUNDLE_PREFIX = "com.yacreader"
DEPENDPATH += . \
release
DEFINES += NOMINMAX YACREADER
QMAKE_MAC_SDK = macosx10.12
#load default build flags
include (../config.pri)
include (../dependencies/pdf_backend.pri)
unix:!macx{
QMAKE_CXXFLAGS += -std=c++11
}
unix:haiku {
DEFINES += _BSD_SOURCE
LIBS += -lnetwork -lbsd
}
CONFIG(force_angle) {
contains(QMAKE_TARGET.arch, x86_64) {
Release:DESTDIR = ../release64_angle
Debug:DESTDIR = ../debug64_angle
} else {
Release:DESTDIR = ../release_angle
Debug:DESTDIR = ../debug_angle
}
} else {
contains(QMAKE_TARGET.arch, x86_64) {
Release:DESTDIR = ../release64
Debug:DESTDIR = ../debug64
} else {
Release:DESTDIR = ../release
Debug:DESTDIR = ../debug
}
}
SOURCES += main.cpp
INCLUDEPATH += ../common \
../custom_widgets
!CONFIG(no_opengl):CONFIG(legacy_gl_widget) {
INCLUDEPATH += ../common/gl_legacy \
} else {
INCLUDEPATH += ../common/gl \
}
#there are going to be two builds for windows, OpenGL based and ANGLE based
win32 {
CONFIG(force_angle) {
message("using ANGLE")
LIBS += -loleaut32 -lole32 -lshell32 -lopengl32 -lglu32 -luser32
#linking extra libs are necesary for a successful compilation, a better approach should be
#to remove any OpenGL (desktop) dependencies
#the OpenGL stuff should be migrated to OpenGL ES
DEFINES += FORCE_ANGLE
} else {
LIBS += -loleaut32 -lole32 -lshell32 -lopengl32 -lglu32 -luser32
}
QMAKE_CXXFLAGS_RELEASE += /MP /Ob2 /Oi /Ot /GT /GL
QMAKE_LFLAGS_RELEASE += /LTCG
CONFIG -= embed_manifest_exe
}
unix:!macx:!CONFIG(no_opengl) {
LIBS += -lGLU
}
macx {
QT += macextras gui-private
CONFIG += objective_c
LIBS += -framework Foundation -framework ApplicationServices -framework AppKit
}
QT += network widgets core multimedia
!CONFIG(no_opengl) {
QT += opengl
}
#CONFIG += release
CONFIG -= flat
# Sources
HEADERS += ../common/comic.h \
configuration.h \
goto_dialog.h \
magnifying_glass.h \
main_window_viewer.h \
viewer.h \
goto_flow.h \
options_dialog.h \
../common/bookmarks.h \
bookmarks_dialog.h \
render.h \
shortcuts_dialog.h \
translator.h \
goto_flow_widget.h \
page_label_widget.h \
goto_flow_toolbar.h \
width_slider.h \
notifications_label_widget.h \
../common/pictureflow.h \
../common/custom_widgets.h \
../common/check_new_version.h \
../common/qnaturalsorting.h \
../common/yacreader_global.h \
../common/yacreader_global_gui.h \
../common/onstart_flow_selection_dialog.h \
../common/comic_db.h \
../common/folder.h \
../common/library_item.h \
yacreader_local_client.h \
../common/http_worker.h \
../common/exit_check.h \
../common/scroll_management.h \
../common/opengl_checker.h \
../common/pdf_comic.h
!CONFIG(no_opengl) {
CONFIG(legacy_gl_widget) {
message("Using legacy YACReaderFlowGL (QGLWidget) header")
DEFINES += YACREADER_LEGACY_FLOW_GL
HEADERS += ../common/gl_legacy/yacreader_flow_gl.h
} else {
HEADERS += ../common/gl/yacreader_flow_gl.h
}
HEADERS += goto_flow_gl.h
}
SOURCES += ../common/comic.cpp \
configuration.cpp \
goto_dialog.cpp \
magnifying_glass.cpp \
main_window_viewer.cpp \
viewer.cpp \
goto_flow.cpp \
options_dialog.cpp \
../common/bookmarks.cpp \
bookmarks_dialog.cpp \
render.cpp \
shortcuts_dialog.cpp \
translator.cpp \
goto_flow_widget.cpp \
page_label_widget.cpp \
goto_flow_toolbar.cpp \
width_slider.cpp \
notifications_label_widget.cpp \
../common/pictureflow.cpp \
../common/custom_widgets.cpp \
../common/check_new_version.cpp \
../common/qnaturalsorting.cpp \
../common/onstart_flow_selection_dialog.cpp \
../common/comic_db.cpp \
../common/folder.cpp \
../common/library_item.cpp \
yacreader_local_client.cpp \
../common/http_worker.cpp \
../common/yacreader_global.cpp \
../common/yacreader_global_gui.cpp \
../common/exit_check.cpp \
../common/scroll_management.cpp \
../common/opengl_checker.cpp
!CONFIG(no_opengl) {
CONFIG(legacy_gl_widget) {
message("using legacy YACReaderFlowGL (QGLWidget) source code")
SOURCES += ../common/gl_legacy/yacreader_flow_gl.cpp
} else {
SOURCES += ../common/gl/yacreader_flow_gl.cpp
}
SOURCES += goto_flow_gl.cpp
}
include(../custom_widgets/custom_widgets_yacreader.pri)
CONFIG(7zip){
include(../compressed_archive/wrapper.pri)
} else:CONFIG(unarr){
include(../compressed_archive/unarr/unarr-wrapper.pri)
} else {
error(No compression backend specified. Did you mess with the build system?)
}
include(../shortcuts_management/shortcuts_management.pri)
RESOURCES += yacreader_images.qrc \
yacreader_files.qrc
win32:RESOURCES += yacreader_images_win.qrc
unix:!macx:RESOURCES += yacreader_images_win.qrc
macx:RESOURCES += yacreader_images_osx.qrc
include(../QsLog/QsLog.pri)
RC_FILE = icon.rc
macx {
ICON = YACReader.icns
QMAKE_INFO_PLIST = Info.plist
}
TRANSLATIONS = yacreader_es.ts \
yacreader_fr.ts \
yacreader_ru.ts \
yacreader_pt.ts \
yacreader_nl.ts \
yacreader_tr.ts \
yacreader_de.ts \
yacreader_source.ts
unix:!macx {
#set install prefix if it's empty
isEmpty(PREFIX) {
PREFIX = /usr
}
BINDIR = $$PREFIX/bin
LIBDIR = $$PREFIX/lib
DATADIR = $$PREFIX/share
DEFINES += "LIBDIR=\\\"$$LIBDIR\\\"" "DATADIR=\\\"$$DATADIR\\\""
#MAKE INSTALL
INSTALLS += bin docs icon desktop translation manpage
bin.path = $$BINDIR
isEmpty(DESTDIR) {
bin.files = YACReader
} else {
bin.files = $$DESTDIR/YACReader
}
docs.path = $$DATADIR/doc/yacreader
#rename docs for better packageability
docs.extra = cp ../README.txt ../README
docs.files = ../README ../CHANGELOG.md
icon.path = $$DATADIR/icons/hicolor/scalable/apps
icon.files = ../YACReader.svg
desktop.path = $$DATADIR/applications
desktop.files = ../YACReader.desktop
translation.path = $$DATADIR/yacreader/languages
translation.files = ../release/languages/yacreader_*
manpage.path = $$DATADIR/man/man1
manpage.files = ../YACReader.1
#remove leftover doc files when 'make clean' is invoked
QMAKE_CLEAN += "../README"
}

197
YACReader/bookmarks_dialog.cpp Normal file
View File

@ -0,0 +1,197 @@
#include "bookmarks_dialog.h"
#include <QGridLayout>
#include <QLabel>
#include <QApplication>
#include <QDesktopWidget>
#include <QFrame>
#include <QImage>
#include "bookmarks.h"
BookmarksDialog::BookmarksDialog(QWidget * parent)
:QDialog(parent)
{
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("-"));
QString labelsStyle = "QLabel {color:white;}";
foreach(QLabel * label,pages)
{
label->setStyleSheet(labelsStyle);
}
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);
cancel->setStyleSheet("QPushButton {border: 1px solid #242424; background: #2e2e2e; color:white; padding: 5px 26px 5px 26px; font-size:12px;font-family:Arial; font-weight:bold;}");
QVBoxLayout * l = new QVBoxLayout();
l->addWidget(new QLabel("<font color=\"#FFFFFF\">"+tr("Click on any image to go to the bookmark")+"</font>"),0,Qt::AlignCenter);
l->addLayout(layout);
#ifdef Q_OS_MAC
l->addLayout(buttons);
#endif
QPalette Pal(palette());
// set black background
Pal.setColor(QPalette::Background, QColor("#454545"));
this->setAutoFillBackground(true);
this->setPalette(Pal);
setLayout(l);
}
void BookmarksDialog::setBookmarks(const Bookmarks & bm)
{
lastPage = bm.getLastPage();
if (lastPage > 0)
{
QPixmap p = QPixmap::fromImage(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<int> l = bm.getBookmarkPages();
int s = l.count();
for(int i=0;i<s;i++)
{
pages.at(i+1)->setText(QString::number(l.at(i)+1));
QPixmap p = QPixmap::fromImage(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));
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)-1;
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();
}*/

45
YACReader/bookmarks_dialog.h Normal file
View File

@ -0,0 +1,45 @@
#ifndef __BOOKMARKS_DIALOG_H
#define __BOOKMARKS_DIALOG_H
#include <QWidget>
#include <QDialog>
#include <QLabel>
#include <QPushButton>
#include <QEvent>
#include <QKeyEvent>
#include <QPropertyAnimation>
#include "bookmarks.h"
class BookmarksDialog : public QDialog
{
Q_OBJECT
protected:
QList<QLabel *> pages;
QList<QLabel *> 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

79
YACReader/configuration.cpp Normal file
View File

@ -0,0 +1,79 @@
#include "configuration.h"
#include <QFile>
#include <QFile>
#include <QTextStream>
#include <QCoreApplication>
#include <QStringList>
#include <QMessageBox>
#include "yacreader_global.h"
Configuration::Configuration()
{
//read configuration
//load("/YACReader.conf");
}
QSettings *Configuration::getSettings()
{
return settings;
}
/*Configuration::Configuration(const Configuration & conf)
{
//nothing
}*/
void Configuration::load(QSettings * settings)
{
this->settings = settings;
//TODO set defaults
if(!settings->contains(PATH))
settings->setValue(PATH,".");
if(!settings->contains(GO_TO_FLOW_SIZE))
settings->setValue(GO_TO_FLOW_SIZE,QSize(126,200));
if(!settings->contains(MAG_GLASS_SIZE))
settings->setValue(MAG_GLASS_SIZE,QSize(350,175));
if(!settings->contains(ZOOM_LEVEL))
settings->setValue(MAG_GLASS_SIZE,QSize(350,175));
if(!settings->contains(FLOW_TYPE))
settings->setValue(FLOW_TYPE,0);
if(!settings->contains(FULLSCREEN))
settings->setValue(FULLSCREEN,false);
if(!settings->contains(Y_WINDOW_SIZE))
settings->setValue(Y_WINDOW_SIZE,QSize(0,0));
if(!settings->contains(MAXIMIZED))
settings->setValue(MAXIMIZED,false);
if(!settings->contains(DOUBLE_PAGE))
settings->setValue(DOUBLE_PAGE,false);
if(!settings->contains(BACKGROUND_COLOR))
settings->setValue(BACKGROUND_COLOR,QColor(40,40,40));
if(!settings->contains(ALWAYS_ON_TOP))
settings->setValue(ALWAYS_ON_TOP,false);
if(!settings->contains(SHOW_TOOLBARS))
settings->setValue(SHOW_TOOLBARS, true);
if(!settings->contains(QUICK_NAVI_MODE))
settings->setValue(QUICK_NAVI_MODE, false);
//old fit stuff
/*if(!settings->contains(FIT))
settings->setValue(FIT,false);
if(!settings->contains(FIT_TO_WIDTH_RATIO))
settings->setValue(FIT_TO_WIDTH_RATIO,1);
if(!settings->contains(ADJUST_TO_FULL_SIZE))
settings->setValue(ADJUST_TO_FULL_SIZE,false);
*/
}
void Configuration::updateOpenRecentList (QString path)
{
QStringList list = openRecentList();
list.removeAll(path);
list.prepend(path);
//TODO: Make list lenght configurable
while (list.length() > getOpenRecentSize())
{
list.removeLast();
}
settings->setValue("recentFiles", list);
}

117
YACReader/configuration.h Normal file
View File

@ -0,0 +1,117 @@
#ifndef __CONFIGURATION_H
#define __CONFIGURATION_H
#include <QString>
#include <QSize>
#include <QObject>
#include <QPoint>
#include <QColor>
#include <QSettings>
#include <QDate>
#include "yacreader_global_gui.h"
#define CONF_FILE_PATH "."
#define SLIDE_ASPECT_RATIO 1.585
using namespace YACReader;
class Configuration : public QObject
{
Q_OBJECT
private:
QSettings * settings;
QString defaultPath;
//configuration properties
QSize magnifyingGlassSize;
QSize gotoSlideSize;
float zoomLevel;
bool adjustToWidth;
bool fullScreen;
FlowType flowType;
float fitToWidthRatio;
QPoint windowPos;
QSize windowSize;
bool maximized;
bool doublePage;
bool doubleMangaPage;
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;
};
QSettings *getSettings();
void load(QSettings * settings);
QString getDefaultPath() { return settings->value(PATH).toString(); }
void setDefaultPath(QString defaultPath){settings->setValue(PATH,defaultPath);}
QSize getMagnifyingGlassSize() { return settings->value(MAG_GLASS_SIZE).toSize();}
void setMagnifyingGlassSize(const QSize & mgs) { settings->setValue(MAG_GLASS_SIZE,mgs);}
QSize getGotoSlideSize() { return settings->value(GO_TO_FLOW_SIZE).toSize();}
void setGotoSlideSize(const QSize & gss) { settings->setValue(GO_TO_FLOW_SIZE,gss);}
float getZoomLevel() { return settings->value(ZOOM_LEVEL).toFloat();}
void setZoomLevel(float zl) { settings->setValue(ZOOM_LEVEL,zl);}
//Unified enum based fitmode
YACReader::FitMode getFitMode() { return static_cast<YACReader::FitMode>(settings->value(FITMODE, YACReader::FitMode::FullPage).toInt()); }
void setFitMode ( YACReader::FitMode fitMode ){ settings->setValue(FITMODE, static_cast<int>(fitMode)); }
//openRecent
int getOpenRecentSize() { return settings->value("recentSize", 25).toInt();}
QStringList openRecentList() { return settings->value("recentFiles").toStringList(); }
void updateOpenRecentList (QString path);
void clearOpenRecentList() { settings->remove("recentFiles"); }
//Old fitmodes
/*
bool getAdjustToWidth() {return settings->value(FIT).toBool();}
void setAdjustToWidth(bool atw=true) {settings->setValue(FIT,atw);}
float getFitToWidthRatio(){return settings->value(FIT_TO_WIDTH_RATIO).toFloat();}
void setFitToWidthRatio(float r){settings->setValue(FIT_TO_WIDTH_RATIO,r);}
bool getAdjustToFullSize(){return settings->value(ADJUST_TO_FULL_SIZE).toBool();}
void setAdjustToFullSize(bool b){settings->setValue(ADJUST_TO_FULL_SIZE,b);}
*/
FlowType getFlowType(){return (FlowType)settings->value(FLOW_TYPE_SW).toInt();}
void setFlowType(FlowType type){settings->setValue(FLOW_TYPE_SW,type);}
bool getFullScreen(){return settings->value(FULLSCREEN).toBool();}
void setFullScreen(bool f){settings->setValue(FULLSCREEN,f);}
QPoint getPos(){return settings->value(Y_WINDOW_POS).toPoint();}
void setPos(QPoint p){settings->setValue(Y_WINDOW_POS,p);}
QSize getSize(){return settings->value(Y_WINDOW_SIZE).toSize();}
void setSize(QSize s){settings->setValue(Y_WINDOW_SIZE,s);}
bool getMaximized(){return settings->value(MAXIMIZED).toBool();}
void setMaximized(bool b){settings->setValue(MAXIMIZED,b);}
bool getDoublePage(){return settings->value(DOUBLE_PAGE).toBool();}
void setDoublePage(bool b){settings->setValue(DOUBLE_PAGE,b);}
bool getDoubleMangaPage(){return settings->value(DOUBLE_MANGA_PAGE).toBool();}
void setDoubleMangaPage(bool b){settings->setValue(DOUBLE_MANGA_PAGE,b);}
QColor getBackgroundColor(){return settings->value(BACKGROUND_COLOR).value<QColor>();}
void setBackgroundColor(const QColor& color){settings->value(BACKGROUND_COLOR,color);}
bool getAlwaysOnTop(){return settings->value(ALWAYS_ON_TOP).toBool();}
void setAlwaysOnTop(bool b){ settings->setValue(ALWAYS_ON_TOP,b);}
bool getShowToolbars(){return settings->value(SHOW_TOOLBARS).toBool();}
void setShowToolbars(bool b){settings->setValue(SHOW_TOOLBARS,b);}
bool getShowInformation(){return settings->value(SHOW_INFO,false).toBool();}
void setShowInformation(bool b){settings->setValue(SHOW_INFO,b);}
QDate getLastVersionCheck(){return settings->value(LAST_VERSION_CHECK).toDate();}
void setLastVersionCheck(const QDate & date){ settings->setValue(LAST_VERSION_CHECK,date);}
int getNumDaysBetweenVersionChecks() {return settings->value(NUM_DAYS_BETWEEN_VERSION_CHECKS,1).toInt();}
void setNumDaysBetweenVersionChecks(int days) {return settings->setValue(NUM_DAYS_BETWEEN_VERSION_CHECKS,days);}
bool getQuickNaviMode(){return settings->value(QUICK_NAVI_MODE).toBool();}
bool getDisableShowOnMouseOver(){return settings->value(DISABLE_MOUSE_OVER_GOTO_FLOW).toBool();}
};
#endif

84
YACReader/goto_dialog.cpp Normal file
View File

@ -0,0 +1,84 @@
#include "goto_dialog.h"
#include <QHBoxLayout>
#include <QVBoxLayout>
#include <QIntValidator>
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);
pageNumber->setFocusPolicy(Qt::StrongFocus);
pageNumber->setFocus();
}
void GoToDialog::goTo()
{
unsigned int page = pageNumber->text().toInt();
pageNumber->clear();
if(page >= 1)
emit(goToPage(page-1));
close();
}
void GoToDialog::setNumPages(unsigned int numPages)
{
numPagesLabel->setText(tr("Total pages : ")+QString::number(numPages));
v->setTop(numPages);
}
void GoToDialog::open()
{
pageNumber->setFocus();
QDialog::open();
}

32
YACReader/goto_dialog.h Normal file
View File

@ -0,0 +1,32 @@
#ifndef __GOTODIALOG_H
#define __GOTODIALOG_H
#include <QDialog>
#include <QLabel>
#include <QLineEdit>
#include <QPushButton>
#include <QIntValidator>
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);
void open();
signals:
void goToPage(unsigned int page);
};
#endif

322
YACReader/goto_flow.cpp Normal file
View File

@ -0,0 +1,322 @@
#include "goto_flow.h"
#include "configuration.h"
#include "comic.h"
#include <QVBoxLayout>
#include <QSize>
#include <QImage>
#include <QLabel>
#include <QPushButton>
#include <QMutex>
#include <QApplication>
#include <QLineEdit>
#include <QPushButton>
#include <QPixmap>
#include <QThread>
#include <QSize>
#include <QIntValidator>
#include <QWaitCondition>
#include <QObject>
#include <QEvent>
#include <QLabel>
#include "yacreader_flow.h"
#include "goto_flow_toolbar.h"
GoToFlow::GoToFlow(QWidget *parent,FlowType flowType)
:GoToFlowWidget(parent),ready(false)
{
updateTimer = new QTimer;
connect(updateTimer, SIGNAL(timeout()), this, SLOT(updateImageData()));
worker = new PageLoader(&mutexGoToFlow);
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,SIGNAL(goToPage(unsigned int)));
connect(toolBar,SIGNAL(goTo(unsigned int)),this,SIGNAL(goToPage(unsigned int)));
connect(toolBar,SIGNAL(setCenter(unsigned int)),flow,SLOT(showSlide(unsigned int)));
mainLayout->addWidget(flow);
toolBar->raise();
resize(static_cast<int>(5*imageSize.width()),toolBar->height() + static_cast<int>(imageSize.height()*1.7));
this->setCursor(QCursor(Qt::ArrowCursor));
}
GoToFlow::~GoToFlow()
{
delete flow;
delete updateTimer;
worker->deleteLater();
}
void GoToFlow::keyPressEvent(QKeyEvent *event)
{
switch (event->key())
{
case Qt::Key_Left: case Qt::Key_Right: case Qt::Key_Up:
QApplication::sendEvent(flow,event);
return;
default:
break;
}
GoToFlowWidget::keyPressEvent(event);
}
void GoToFlow::resizeEvent(QResizeEvent *event)
{
QWidget::resizeEvent(event);
toolBar->move(0, event->size().height() - toolBar->height());
toolBar->setFixedWidth(width());
}
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);
toolBar->setTop(slides);
SlideInitializer * si = new SlideInitializer(&mutexGoToFlow,flow,slides);
imagesLoaded.clear();
imagesLoaded.fill(false,slides);
imagesSetted.clear();
imagesSetted.fill(false,slides);
numImagesLoaded = 0;
connect(flow, SIGNAL(centerIndexChanged(int)), this, SLOT(preload()));
connect(flow, SIGNAL(centerIndexChangedSilent(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
imagesLoaded[idx]=true;
}
}
// 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
worker->generate(i, flow->slideSize(),rawImages[i]);
return;
}
}
// no need to generate anything? stop polling...
updateTimer->stop();
}
void GoToFlow::wheelEvent(QWheelEvent * event)
{
if(event->delta()<0)
flow->showNext();
else
flow->showPrevious();
event->accept();
}
void GoToFlow::setFlowType(FlowType flowType)
{
flow->setFlowType(flowType);
}
void GoToFlow::updateConfig(QSettings * settings)
{
GoToFlowWidget::updateConfig(settings);
imageSize = Configuration::getConfiguration().getGotoSlideSize();
flow->setFlowType(Configuration::getConfiguration().getFlowType());
resize(5*imageSize.width(), toolBar->height() + imageSize.height()*1.7);
updateSize();
}
void GoToFlow::setFlowRightToLeft(bool b)
{
flow->setFlowRightToLeft(b);
}
//-----------------------------------------------------------------------------
//SlideInitializer
//-----------------------------------------------------------------------------
SlideInitializer::SlideInitializer(QMutex * m,PictureFlow * flow,int slides)
:QThread(),mutex(m),_flow(flow),_slides(slides)
{
}
void SlideInitializer::run()
{
mutex->lock();
_flow->clear();
for(int i=0;i<_slides;i++)
_flow->addSlide(QImage());
_flow->setCenterIndex(0);
mutex->unlock();
}
//-----------------------------------------------------------------------------
//PageLoader
//-----------------------------------------------------------------------------
PageLoader::PageLoader(QMutex * m):
QThread(),mutex(m), restart(false), working(false), idx(-1)
{
}
PageLoader::~PageLoader()
{
mutex->lock();
condition.wakeOne();
mutex->unlock();
wait();
}
bool PageLoader::busy() const
{
return isRunning() ? working : false;
}
void PageLoader::generate(int index, QSize size,const QByteArray & rImage)
{
mutex->lock();
this->idx = index;
//this->img = QImage();
this->size = size;
this->rawImage = rImage;
mutex->unlock();
if (!isRunning())
start();
else
{
// already running, wake up whenever ready
restart = true;
condition.wakeOne();
}
}
void PageLoader::run()
{
for(;;)
{
// copy necessary data
mutex->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);
mutex->unlock();
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();
}
}

114
YACReader/goto_flow.h Normal file
View File

@ -0,0 +1,114 @@
#ifndef __GOTO_FLOW_H
#define __GOTO_FLOW_H
#include "goto_flow_widget.h"
#include "yacreader_global_gui.h"
#include <QThread>
#include <QWaitCondition>
#include <QMutex>
class QLineEdit;
class QPushButton;
class QPixmap;
class QThread;
class QSize;
class QIntValidator;
class QWaitCondition;
class QEvent;
class QLabel;
class Comic;
class SlideInitializer;
class PageLoader;
class YACReaderFlow;
class PictureFlow;
class QKeyEvent;
class GoToFlow : public GoToFlowWidget
{
Q_OBJECT
public:
GoToFlow(QWidget* parent = 0,FlowType flowType = CoverFlowLike);
~GoToFlow();
bool ready; //comic is ready for read.
private:
YACReaderFlow * flow;
void keyPressEvent(QKeyEvent* event);
//Comic * comic;
QSize imageSize;
QVector<bool> imagesLoaded;
QVector<bool> imagesSetted;
int numImagesLoaded;
QVector<bool> imagesReady;
QVector<QByteArray> rawImages;
QTimer* updateTimer;
PageLoader* worker;
virtual void wheelEvent(QWheelEvent * event);
QMutex mutexGoToFlow;
private slots:
void preload();
void updateImageData();
void resizeEvent(QResizeEvent *event);
public slots:
void centerSlide(int slide);
void reset();
void setNumSlides(unsigned int slides);
void setImageReady(int index,const QByteArray & image);
void setFlowType(FlowType flowType);
void updateConfig(QSettings * settings);
void setFlowRightToLeft(bool b);
signals:
void goToPage(unsigned int page);
};
//-----------------------------------------------------------------------------
//SlideInitializer
//-----------------------------------------------------------------------------
class SlideInitializer : public QThread
{
public:
SlideInitializer(QMutex * m,PictureFlow * flow,int slides);
private:
QMutex * mutex;
PictureFlow * _flow;
int _slides;
void run();
};
//-----------------------------------------------------------------------------
//PageLoader
//-----------------------------------------------------------------------------
class PageLoader : public QThread
{
public:
PageLoader(QMutex * m);
~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:
QMutex * mutex;
QWaitCondition condition;
bool restart;
bool working;
int idx;
QSize size;
QImage img;
QByteArray rawImage;
};
#endif

167
YACReader/goto_flow_gl.cpp Normal file
View File

@ -0,0 +1,167 @@
#include "goto_flow_gl.h"
#include <QLineEdit>
#include <QIntValidator>
#include <QPushButton>
#include <QPushButton>
#include <QSize>
#include <QApplication>
#include "configuration.h"
#include "goto_flow_toolbar.h"
GoToFlowGL::GoToFlowGL(QWidget* parent, FlowType flowType)
:GoToFlowWidget(parent)
{
Q_UNUSED(flowType)
flow = new YACReaderPageFlowGL(this);
flow->setShowMarks(false);
imageSize = Configuration::getConfiguration().getGotoSlideSize();
flow->setSlideSize(imageSize);
connect(flow,SIGNAL(centerIndexChanged(int)),this,SLOT(setPageNumber(int)));
connect(flow,SIGNAL(selected(unsigned int)),this,SIGNAL(goToPage(unsigned int)));
connect(toolBar,SIGNAL(goTo(unsigned int)),this,SIGNAL(goToPage(unsigned int)));
connect(toolBar,SIGNAL(setCenter(unsigned int)),flow,SLOT(setCenterIndex(unsigned int)));
mainLayout->addWidget(flow);
toolBar->raise();
resize(static_cast<int>(5*imageSize.width()),toolBar->height() + static_cast<int>(imageSize.height()*1.7));
this->setCursor(QCursor(Qt::ArrowCursor));
}
GoToFlowGL::~GoToFlowGL()
{
delete flow;
}
void GoToFlowGL::reset()
{
flow->reset();
}
void GoToFlowGL::centerSlide(int slide)
{
if(flow->centerIndex()!=slide)
{
flow->setCenterIndex(slide);
}
}
void GoToFlowGL::setFlowType(FlowType flowType)
{
if(flowType == CoverFlowLike)
flow->setPreset(presetYACReaderFlowClassicConfig);
else if(flowType == Strip)
flow->setPreset(presetYACReaderFlowStripeConfig);
else if(flowType == StripOverlapped)
flow->setPreset(presetYACReaderFlowOverlappedStripeConfig);
else
flow->setPreset(defaultYACReaderFlowConfig);
}
void GoToFlowGL::setNumSlides(unsigned int slides)
{
flow->populate(slides);
toolBar->setTop(slides);
}
void GoToFlowGL::setImageReady(int index,const QByteArray & imageData)
{
flow->rawImages[index] = imageData;
flow->imagesReady[index] = true;
}
void GoToFlowGL::updateConfig(QSettings * settings)
{
GoToFlowWidget::updateConfig(settings);
Performance performance = medium;
switch (settings->value(PERFORMANCE).toInt())
{
case 0:
performance = low;
break;
case 1:
performance = medium;
break;
case 2:
performance = high;
break;
case 3:
performance = ultraHigh;
break;
}
imageSize = Configuration::getConfiguration().getGotoSlideSize();
resize(5*imageSize.width(), toolBar->height() + imageSize.height()*1.7);
updateSize();
flow->setPerformance(performance);
switch (settings->value(FLOW_TYPE_GL).toInt())
{
case FlowType::CoverFlowLike:
flow->setPreset(presetYACReaderFlowClassicConfig);
break;
case FlowType::Strip:
flow->setPreset(presetYACReaderFlowStripeConfig);
break;
case FlowType::StripOverlapped:
flow->setPreset(presetYACReaderFlowOverlappedStripeConfig);
break;
case FlowType::Modern:
flow->setPreset(defaultYACReaderFlowConfig);
break;
case FlowType::Roulette:
flow->setPreset(pressetYACReaderFlowDownConfig);
break;
case FlowType::Custom:
flow->setCF_RX(settings->value(X_ROTATION).toInt());
flow->setCF_Y(settings->value(Y_POSITION).toInt());
flow->setX_Distance(settings->value(COVER_DISTANCE).toInt());
flow->setCenter_Distance(settings->value(CENTRAL_DISTANCE).toInt());
flow->setCF_Z(settings->value(ZOOM_LEVEL).toInt());
flow->setY_Distance(settings->value(Y_COVER_OFFSET).toInt());
flow->setZ_Distance(settings->value(Z_COVER_OFFSET).toInt());
flow->setRotation(settings->value(COVER_ROTATION).toInt());
flow->setFadeOutDist(settings->value(FADE_OUT_DIST).toInt());
flow->setLightStrenght(settings->value(LIGHT_STRENGTH).toInt());
flow->setMaxAngle(settings->value(MAX_ANGLE).toInt());
break;
}
if (Configuration::getConfiguration().getQuickNaviMode())
flow->setFadeOutDist(20);
}
void GoToFlowGL::keyPressEvent(QKeyEvent* event)
{
switch (event->key())
{
case Qt::Key_Left: case Qt::Key_Right: case Qt::Key_Up:
QApplication::sendEvent(flow,event);
return;
default:
break;
}
GoToFlowWidget::keyPressEvent(event);
}
void GoToFlowGL::resizeEvent(QResizeEvent *event)
{
QWidget::resizeEvent(event);
toolBar->move(0, event->size().height() - toolBar->height());
toolBar->setFixedWidth(width());
}
void GoToFlowGL::setFlowRightToLeft(bool b)
{
flow->setFlowRightToLeft(b);
}

40
YACReader/goto_flow_gl.h Normal file
View File

@ -0,0 +1,40 @@
#ifndef __GOTO_FLOW_GL_H
#define __GOTO_FLOW_GL_H
#include "yacreader_global.h"
#include "goto_flow_widget.h"
#include "yacreader_flow_gl.h"
class QLineEdit;
class QIntValidator;
class QPushButton;
class QPushButton;
class QSize;
class QKeyEvent;
class GoToFlowGL : public GoToFlowWidget
{
Q_OBJECT
public:
GoToFlowGL(QWidget* parent = 0,FlowType flowType = CoverFlowLike);
~GoToFlowGL();
void reset();
void centerSlide(int slide);
void setFlowType(FlowType flowType);
void setNumSlides(unsigned int slides);
void setImageReady(int index,const QByteArray & image);
void updateConfig(QSettings * settings);
void setFlowRightToLeft(bool b);
signals:
void goToPage(unsigned int page);
private:
YACReaderPageFlowGL * flow;
void keyPressEvent(QKeyEvent* event);
void resizeEvent(QResizeEvent *event);
//Comic * comic;
QSize imageSize;
};
#endif

137
YACReader/goto_flow_toolbar.cpp Normal file
View File

@ -0,0 +1,137 @@
#include "goto_flow_toolbar.h"
#include <QtWidgets>
#include "configuration.h"
GoToFlowToolBar::GoToFlowToolBar(QWidget * parent)
:QStackedWidget(parent)
{
//elementos interactivos
QWidget * normal = new QWidget(this); // container widget
QWidget * quickNavi = new QWidget(this); // container widget
addWidget(normal);
addWidget(quickNavi);
QHBoxLayout * normalLayout = new QHBoxLayout(normal);
QHBoxLayout * naviLayout = new QHBoxLayout(quickNavi);
normal->setLayout(normalLayout);
quickNavi->setLayout(naviLayout);
slider = new QSlider(Qt::Horizontal,this);
slider->setStyleSheet(
"QSlider::groove:horizontal {"
" border: 1px solid #22FFFFFF;"
" border-radius: 1px;"
" background: #77000000;"
" margin: 2px 0;"
" padding: 1px;"
"}"
"QSlider::handle:horizontal {"
" background: #55FFFFFF;"
" width: 48px;"
" border-radius: 1px;"
"}"
);
connect(slider, &QSlider::valueChanged, this, [&](int v) { emit(setCenter(v)); });
pageHint = new QLabel("<b>" + tr("Page : ") + "</b>",this);
v = new QIntValidator(this);
v->setBottom(1);
edit = new QLineEdit(this);
edit->setValidator(v);
edit->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
edit->setStyleSheet("QLineEdit {border: 1px solid #77000000; background: #55000000; color: white; padding: 3px 5px 5px 5px; margin: 13px 5px 12px 5px; font-weight:bold}");
QPixmap p(":/images/imgEdit.png");
edit->setFixedSize(54,50);
edit->setAttribute(Qt::WA_MacShowFocusRect,false);
//edit->setAttribute(Qt::WA_LayoutUsesWidgetRect,true);
//edit->resize(QSize(54,50));
edit->setSizePolicy(QSizePolicy(QSizePolicy::Fixed,QSizePolicy::Fixed));
//edit->setAutoFillBackground(false);
connect(edit,SIGNAL(returnPressed()),this,SLOT(goTo()));
QString centerButtonCSS = "QPushButton {background-image: url(:/images/imgCenterSlide.png); width: 100%; height:100%; background-repeat: none; border: none;} "
"QPushButton:focus { border: none; outline: none;}"
"QPushButton:pressed {background-image: url(:/images/imgCenterSlidePressed.png); width: 100%; height:100%; background-repeat: none; border: none;} ";
centerButton = new QPushButton(this);
//centerButton->setIcon(QIcon(":/images/center.png"));
centerButton->setStyleSheet(centerButtonCSS);
centerButton->setFixedSize(26,50);
centerButton->setAttribute(Qt::WA_LayoutUsesWidgetRect,true);
connect(centerButton,SIGNAL(clicked()),this,SLOT(centerSlide()));
QString goToButtonCSS = "QPushButton {background-image: url(:/images/imgGoToSlide.png); width: 100%; height:100%; background-repeat: none; border: none;} "
"QPushButton:focus { border: none; outline: none;}"
"QPushButton:pressed {background-image: url(:/images/imgGoToSlidePressed.png); width: 100%; height:100%; background-repeat: none; border: none;} ";
goToButton = new QPushButton(this);
//goToButton->setIcon(QIcon(":/images/goto.png"));
goToButton->setStyleSheet(goToButtonCSS);
goToButton->setFixedSize(32,50);
goToButton->setAttribute(Qt::WA_LayoutUsesWidgetRect,true);
connect(goToButton,SIGNAL(clicked()),this,SLOT(goTo()));
normalLayout->setMargin(0);
normalLayout->setSpacing(0);
normalLayout->addStretch();
normalLayout->addWidget(pageHint);
normalLayout->addWidget(edit);
normalLayout->addWidget(centerButton);
normalLayout->addWidget(goToButton);
normalLayout->addStretch();
naviLayout->setContentsMargins(5, 0, 0, 0);
naviLayout->setSpacing(2);
naviLayout->addWidget(slider);
naviLayout->addWidget(goToButton);
updateOptions();
setFixedHeight(50);
}
void GoToFlowToolBar::paintEvent(QPaintEvent *)
{
QPainter painter(this);
#ifdef YACREADER_LEGACY_FLOW_GL
painter.fillRect(0,0,width(),height(),QColor("#FF000000"));
#else
painter.fillRect(0,0,width(),height(),QColor("#99000000"));
#endif
}
void GoToFlowToolBar::setPage(int pageNumber)
{
edit->setText(QString::number(pageNumber+1));
slider->setValue(pageNumber);
}
void GoToFlowToolBar::setTop(int numPages)
{
v->setTop(numPages);
slider->setMaximum(numPages-1); // min is 0
}
void GoToFlowToolBar::goTo()
{
if(edit->text().toInt()!=0)
emit(goTo(edit->text().toInt()-1));
}
void GoToFlowToolBar::centerSlide()
{
if(edit->text().toInt()!=0)
emit(setCenter(edit->text().toInt()-1));
}
void GoToFlowToolBar::updateOptions()
{
if (Configuration::getConfiguration().getQuickNaviMode())
setCurrentIndex(1);
else
setCurrentIndex(0);
slider->setInvertedAppearance(Configuration::getConfiguration().getDoubleMangaPage());
}

40
YACReader/goto_flow_toolbar.h Normal file
View File

@ -0,0 +1,40 @@
#ifndef GOTO_FLOW_TOOLBAR_H
#define GOTO_FLOW_TOOLBAR_H
#include <QWidget>
#include <QStackedWidget>
class QLineEdit;
class QIntValidator;
class QPushButton;
class QSlider;
class QLabel;
class GoToFlowToolBar : public QStackedWidget
{
Q_OBJECT
private:
QLineEdit * edit;
QSlider * slider;
QIntValidator * v;
QPushButton * centerButton;
QPushButton * goToButton;
QLabel * pageHint;
QWidget * bar;
void paintEvent(QPaintEvent *);
public:
GoToFlowToolBar(QWidget * parent = 0);
public slots:
void setPage(int pageNumber);
void setTop(int numPages);
void goTo();
void centerSlide();
void updateOptions();
signals:
void setCenter(unsigned int);
void goTo(unsigned int);
};
#endif

81
YACReader/goto_flow_widget.cpp Normal file
View File

@ -0,0 +1,81 @@
#include "goto_flow_widget.h"
#include <QSettings>
#include <QHBoxLayout>
#include <QKeyEvent>
#include <QCoreApplication>
#include "goto_flow_toolbar.h"
#include "configuration.h"
GoToFlowWidget::GoToFlowWidget(QWidget * parent)
:QWidget(parent)
{
mainLayout = new QVBoxLayout;
mainLayout->setMargin(0);
mainLayout->setSpacing(0);
toolBar = new GoToFlowToolBar(this);
setLayout(mainLayout);
//toolBar->installEventFilter(this);
}
GoToFlowWidget::~GoToFlowWidget() {
delete toolBar;
delete mainLayout;
}
void GoToFlowWidget::setPageNumber(int page)
{
toolBar->setPage(page);
}
void GoToFlowWidget::keyPressEvent(QKeyEvent* event)
{
switch (event->key())
{
case Qt::Key_Return: case Qt::Key_Enter:
toolBar->goTo();
toolBar->centerSlide();
break;
case Qt::Key_Space:
toolBar->centerSlide();
break;
case Qt::Key_S:
QCoreApplication::sendEvent(this->parent(),event);
break;
}
event->accept();
}
void GoToFlowWidget::updateConfig(QSettings * settings)
{
Q_UNUSED(settings)
toolBar->updateOptions();
}
void GoToFlowWidget::updateSize()
{
// called by parent in resizeEvent
// no need to update width when QuickNaviMode disabled
// height is set in updateConfig
if (Configuration::getConfiguration().getQuickNaviMode() && parentWidget() != nullptr)
resize(parentWidget()->width(),height());
}
/*bool GoToFlowWidget::eventFilter(QObject * target, QEvent * event)
{
if(event->type() == QEvent::KeyPress)
{
QKeyEvent * e = static_cast<QKeyEvent *>(event);
if(e->key()==Qt::Key_S || e->key() == Qt::Key_Space)
{
this->keyPressEvent(e);
return true;
}
}
return QWidget::eventFilter(target,event);
}*/

40
YACReader/goto_flow_widget.h Normal file
View File

@ -0,0 +1,40 @@
#ifndef __GOTO_FLOW_WIDGET_H
#define __GOTO_FLOW_WIDGET_H
#include <QWidget>
#include <QSettings>
#include "yacreader_global_gui.h"
using namespace YACReader;
class QSettings;
class GoToFlowToolBar;
class QVBoxLayout;
class GoToFlowWidget : public QWidget
{
Q_OBJECT
protected:
QVBoxLayout * mainLayout;
GoToFlowToolBar * toolBar;
public:
GoToFlowWidget(QWidget * paret = 0);
virtual ~GoToFlowWidget() = 0;
public slots:
virtual void reset() = 0;
virtual void centerSlide(int slide) = 0;
virtual void setPageNumber(int page);
virtual void setFlowType(FlowType flowType) = 0;
virtual void setNumSlides(unsigned int slides) = 0;
virtual void setImageReady(int index,const QByteArray & image) = 0;
virtual void updateSize();
virtual void updateConfig(QSettings * settings);
virtual void setFlowRightToLeft(bool b) = 0;
protected:
void keyPressEvent(QKeyEvent* event);
//bool eventFilter(QObject *, QEvent *);
};
#endif

BIN
YACReader/icon.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 153 KiB

1
YACReader/icon.rc Normal file
View File

@ -0,0 +1 @@
IDI_ICON1 ICON DISCARDABLE "icon.ico"

292
YACReader/magnifying_glass.cpp Normal file
View File

@ -0,0 +1,292 @@
#include "magnifying_glass.h"
#include "viewer.h"
#include "configuration.h"
#include "shortcuts_manager.h"
#include <QScrollBar>
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(QBitmap(1,1),QBitmap(1,1)));
}
void MagnifyingGlass::mouseMoveEvent(QMouseEvent * event)
{
updateImage();
event->accept();
}
void MagnifyingGlass::updateImage(int x, int y)
{
//image section augmented
int zoomWidth = static_cast<int>(width() * zoomLevel);
int zoomHeight = static_cast<int>(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<float>(iWidth) / p->widget()->width();
float hFactor = static_cast<float>(iHeight) / p->widget()->height();
zoomWidth *= wFactor;
zoomHeight *= hFactor;
if(p->verticalScrollBar()->minimum()==p->verticalScrollBar()->maximum())
{
int xp = static_cast<int>(((x-p->widget()->pos().x())*wFactor)-zoomWidth/2);
int yp = static_cast<int>((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(Configuration::getConfiguration().getBackgroundColor());
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<int>(((x-p->widget()->pos().x())*wFactor)-zoomWidth/2);
int yp = static_cast<int>((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(Configuration::getConfiguration().getBackgroundColor());
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<int>(x-float(width())/2),static_cast<int>(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.2f)
zoomLevel -= 0.025f;
}
void MagnifyingGlass::zoomOut()
{
if(zoomLevel<0.9f)
zoomLevel += 0.025f;
}
void MagnifyingGlass::sizeUp()
{
Viewer * p = (Viewer *)parent();
if(width()<(p->width()*0.90f))
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.90f))
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.90f))
resize(width()+30,height());
}
void MagnifyingGlass::widthDown()
{
if(width()>175)
resize(width()-30,height());
}
void MagnifyingGlass::keyPressEvent(QKeyEvent *event)
{
bool validKey = false;
int _key = event->key();
Qt::KeyboardModifiers modifiers = event->modifiers();
if(modifiers & Qt::ShiftModifier)
_key |= Qt::SHIFT;
if (modifiers & Qt::ControlModifier)
_key |= Qt::CTRL;
if (modifiers & Qt::MetaModifier)
_key |= Qt::META;
if (modifiers & Qt::AltModifier)
_key |= Qt::ALT;
QKeySequence key(_key);
if (key == ShortcutsManager::getShortcutsManager().getShortcut(SIZE_UP_MGLASS_ACTION_Y))
{
sizeUp();
validKey = true;
}
else if (key == ShortcutsManager::getShortcutsManager().getShortcut(SIZE_DOWN_MGLASS_ACTION_Y))
{
sizeDown();
validKey = true;
}
else if (key == ShortcutsManager::getShortcutsManager().getShortcut(ZOOM_IN_MGLASS_ACTION_Y))
{
zoomIn();
validKey = true;
}
else if (key == ShortcutsManager::getShortcutsManager().getShortcut(ZOOM_OUT_MGLASS_ACTION_Y))
{
zoomOut();
validKey = true;
}
if(validKey)
{
updateImage();
event->setAccepted(true);
}
}

34
YACReader/magnifying_glass.h Normal file
View File

@ -0,0 +1,34 @@
#ifndef __MAGNIFYING_GLASS
#define __MAGNIFYING_GLASS
#include <QLabel>
#include <QtGui>
#include <QMouseEvent>
#include <QWidget>
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

186
YACReader/main.cpp Normal file
View File

@ -0,0 +1,186 @@
#include <QApplication>
#include <QPixmap>
#include <QLabel>
//#include <QMetaObject>
#include <QPushButton>
#include <QMainWindow>
#include <QtCore>
#include <QThread>
#include <QFile>
#include <QDataStream>
#include <QTranslator>
#include <QSysInfo>
#include "main_window_viewer.h"
#include "configuration.h"
#include "exit_check.h"
#include "QsLog.h"
#include "QsLogDest.h"
using namespace QsLogging;
#if defined(WIN32) && defined(_DEBUG)
#define _CRTDBG_MAP_ALLOC
#include <stdlib.h>
#include <crtdbg.h>
#define DEBUG_NEW new( _NORMAL_BLOCK, __FILE__, __LINE__ )
#define new DEBUG_NEW
#endif
#ifdef Q_OS_MAC
#include <QEvent>
class YACReaderApplication: public QApplication
{
public:
YACReaderApplication(int & argc, char ** argv) : QApplication(argc,argv)
{}
void setWindow(MainWindowViewer * w)
{
window = w;
}
protected:
bool event(QEvent * event)
{
switch(event->type())
{
case QEvent::FileOpen:
window->openComicFromPath(static_cast<QFileOpenEvent *>(event)->file());
return true;
default:
return QApplication::event(event);
}
}
private:
MainWindowViewer * window;
};
#endif
int main(int argc, char * argv[])
{
#if defined(_MSC_VER) && defined(_DEBUG)
_CrtSetDbgFlag ( _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF );
#endif
//fix for misplaced text in Qt4.8 and Mavericks
#ifdef Q_OS_MAC
#if QT_VERSION < 0x050000
if(QSysInfo::MacintoshVersion > QSysInfo::MV_10_8)
QFont::insertSubstitution(".Lucida Grande UI", "Lucida Grande");
#endif
#endif
#ifdef Q_OS_MAC
YACReaderApplication app(argc,argv);
#else
QApplication app(argc, argv);
#endif
#ifdef FORCE_ANGLE
app.setAttribute(Qt::AA_UseOpenGLES);
#endif
app.setApplicationName("YACReader");
app.setOrganizationName("YACReader");
app.setAttribute(Qt::AA_UseHighDpiPixmaps);
if (QIcon::hasThemeIcon("YACReader")) {
app.setWindowIcon(QIcon::fromTheme("YACReader"));
}
//simple command line parser
//will be replaced by QCommandLineParser in the future
QStringList optlist;
QStringList arglist;
if (argc > 1)
{
//extract options and arguments
optlist = QCoreApplication::arguments().filter(QRegExp ("^-{1,2}")); //options starting with "-"
arglist = QCoreApplication::arguments().filter(QRegExp ("^(?!-{1,2})")); //positional arguments
//deal with standard options
if (!optlist.isEmpty())
{
QTextStream parser(stdout);
if (optlist.contains("--version") || optlist.contains("-v"))
{
parser << app.applicationName() << " " << QString(VERSION) << endl << "Copyright 2014 by Luis Angel San Martin Rodriguez" << endl;
return 0;
}
if (optlist.contains("--help") || optlist.contains("-h"))
{
parser << endl << "Usage: YACReader [File|Directory|Option]" << endl << endl;
parser << "Options:" << endl;
parser << " -h, --help\t\tDisplay this text and exit." << endl;
parser << " -v, --version\t\tDisplay version information and exit." << endl << endl;
parser << "Arguments:" << endl;
parser << " file\t\t\tOpen comic file." <<endl;
parser << " directory\t\tOpen comic directory." << endl << endl;
return 0;
}
}
}
QString destLog = YACReader::getSettingsPath()+"/yacreader.log";
QDir().mkpath(YACReader::getSettingsPath());
Logger& logger = Logger::instance();
logger.setLoggingLevel(QsLogging::InfoLevel);
DestinationPtr fileDestination(DestinationFactory::MakeFileDestination(
destLog, EnableLogRotation, MaxSizeBytes(1048576), MaxOldLogCount(2)));
DestinationPtr debugDestination(DestinationFactory::MakeDebugOutputDestination());
logger.addDestination(debugDestination);
logger.addDestination(fileDestination);
QTranslator translator;
QString sufix = QLocale::system().name();
#if defined Q_OS_UNIX && !defined Q_OS_MAC
translator.load(QString(DATADIR)+"/yacreader/languages/yacreader_"+sufix);
#else
translator.load(QCoreApplication::applicationDirPath()+"/languages/yacreader_"+sufix);
#endif
app.installTranslator(&translator);
MainWindowViewer * mwv = new MainWindowViewer();
//parser code for comic loading needs to be processed after MainWindowViewer creation
//if we have a valid request, open it - if not, load normally
if (argc > 1)
{
if (!optlist.filter("--comicId=").isEmpty() && !optlist.filter("--libraryId=").isEmpty())
{
if (arglist.count()>1)
{
mwv->open(arglist.at(1), optlist.filter("--comicId=").at(0).split("=").at(1).toULongLong(), optlist.filter("--libraryId=").at(0).split("=").at(1).toULongLong());
}
}
else if ((arglist.count()>1))
{
//open first positional argument, silently ignore all following positional arguments
mwv->openComicFromPath(arglist.at(1));
}
}
#ifdef Q_OS_MAC
app.setWindow(mwv);
#endif
mwv->show();
int ret = app.exec();
delete mwv;
//Configuration::getConfiguration().save();
YACReader::exitCheck(ret);
#ifdef Q_OS_MAC
// ugly workaround to avoid crash when app exit on MacOS Sierra due to Qt's QColorDialog bug.
// cf. https://bugreports.qt.io/browse/QTBUG-56448
QColorDialog colorDlg(0);
colorDlg.setOption(QColorDialog::NoButtons);
colorDlg.setCurrentColor(Qt::white);
#endif
return ret;
}

1692
YACReader/main_window_viewer.cpp Normal file
View File

File diff suppressed because it is too large Load Diff

187
YACReader/main_window_viewer.h Normal file
View File

@ -0,0 +1,187 @@
#ifndef __MAIN_WINDOW_VIEWER_H
#define __MAIN_WINDOW_VIEWER_H
#include <QMainWindow>
#include <QScrollArea>
#include <QToolBar>
#include <QAction>
#include <QKeyEvent>
#include <QMouseEvent>
#include <QCloseEvent>
#include <QSettings>
#ifdef Q_OS_MAC
#include "yacreader_macosx_toolbar.h"
#endif
#include "comic_db.h"
class Comic;
class Viewer;
class OptionsDialog;
class HelpAboutDialog;
class HttpVersionChecker;
class ShortcutsDialog;
class YACReaderSliderAction;
class YACReaderSlider;
class EditShortcutsDialog;
class MainWindowViewer : public QMainWindow
{
Q_OBJECT
public slots:
void open();
void open(QString path, ComicDB & comic, QList<ComicDB> & siblings);
void open(QString path, qint64 comicId, qint64 libraryId);
void openFolder();
void openRecent();
void openLatestComic();
void openComicFromRecentAction(QAction *action);
void saveImage();
void toggleToolBars();
void hideToolBars();
void showToolBars();
void enableActions();
void disableActions();
void toggleFullScreen();
void toFullScreen();
void toNormal();
void loadConfiguration();
void newVersion();
void openPreviousComic();
void openNextComic();
void openComicFromPath(QString pathFile);
void openSiblingComic(QString pathFile);
void openComic(QString pathFile);
void openFolderFromPath(QString pathDir);
void openFolderFromPath(QString pathFile, QString atFileName);
void alwaysOnTopSwitch();
void adjustToFullSizeSwitch();
void fitToPageSwitch();
void resetZoomLevel();
void increasePageZoomLevel();
void decreasePageZoomLevel();
void reloadOptions();
void fitToWidth();
void fitToHeight();
void toggleWidthHeight();
void checkNewVersion();
void processReset();
void setUpShortcutsManagement();
void toggleFitToWidthSlider();
/*void viewComic();
void prev();
void next();
void updatePage();*/
private:
//!State
bool fullscreen;
bool toolbars;
bool alwaysOnTop;
bool fromMaximized;
//QTBUG-41883
QSize _size;
QPoint _pos;
QString currentDirectory;
QString currentDirectoryImgDest;
//!Widgets
Viewer * viewer;
//GoToDialog * goToDialog;
OptionsDialog * optionsDialog;
HelpAboutDialog * had;
//ShortcutsDialog * shortcutsDialog;
EditShortcutsDialog * editShortcutsDialog;
//! ToolBars
#ifdef Q_OS_MAC
YACReaderMacOSXToolbar * comicToolBar;
#else
QToolBar * comicToolBar;
#endif
//! Actions
QAction *openAction;
QAction *openFolderAction;
QAction *openLatestComicAction;
QList<QAction*> recentFilesActionList;
QAction *clearRecentFilesAction;
QAction *saveImageAction;
QAction *openPreviousComicAction;
QAction *openNextComicAction;
QAction *nextAction;
QAction *prevAction;
QAction *adjustWidthAction;
QAction *adjustHeightAction;
QAction *goToPageAction;
QAction *optionsAction;
QAction *helpAboutAction;
QAction *showMagnifyingGlassAction;
QAction *setBookmarkAction;
QAction *showBookmarksAction;
QAction *leftRotationAction;
QAction *rightRotationAction;
QAction *showInfoAction;
QAction *closeAction;
QAction *doublePageAction;
QAction *doubleMangaPageAction;
QAction *showShorcutsAction;
QAction *showDictionaryAction;
QAction *alwaysOnTopAction;
QAction *adjustToFullSizeAction;
QAction *fitToPageAction;
QAction *resetZoomAction;
QAction *showZoomSliderlAction;
QAction *increasePageZoomAction;
QAction *decreasePageZoomAction;
QAction *showFlowAction;
QAction *showEditShortcutsAction;
YACReaderSlider * zoomSliderAction;
HttpVersionChecker * versionChecker;
QString previousComicPath;
QString nextComicPath;
//! Método que inicializa el interfaz.
void setupUI();
void createActions();
void createToolBars();
void refreshRecentFilesActionList();
void clearRecentFiles();
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);
QSettings * settings;
ComicDB currentComicDB;
QList<ComicDB> siblingComics;
bool isClient;
QString startComicPath;
quint64 libraryId;
//fullscreen mode in Windows for preventing this bug: QTBUG-41309 https://bugreports.qt.io/browse/QTBUG-41309
Qt::WindowFlags previousWindowFlags;
QPoint previousPos;
QSize previousSize;
signals:
void closed();
protected:
virtual void closeEvent ( QCloseEvent * event );
void sendComic();
public:
MainWindowViewer();
~MainWindowViewer();
};
#endif

76
YACReader/notifications_label_widget.cpp Normal file
View File

@ -0,0 +1,76 @@
#include "notifications_label_widget.h"
#include <QtWidgets>
NotificationsLabelWidget::NotificationsLabelWidget(QWidget * parent)
:QWidget(parent)
{
QVBoxLayout *layout = new QVBoxLayout;
layout->setSpacing(0);
layout->setMargin(0);
setAttribute(Qt::WA_LayoutUsesWidgetRect,true);
effect = new QGraphicsOpacityEffect(this);
effect->setOpacity(1.0);
anim = new QPropertyAnimation(effect,"opacity");
anim->setDuration(500);
anim->setStartValue(1.0);
anim->setEndValue(0.0);
anim->setEasingCurve(QEasingCurve::InExpo);
connect(anim,SIGNAL(finished()),this,SLOT(hide()));
textLabel = new QLabel(this);
textLabel->setAlignment(Qt::AlignVCenter|Qt::AlignHCenter);
textLabel->setStyleSheet("QLabel { color : white; font-size:24px; }");
textLabel->setAttribute(Qt::WA_LayoutUsesWidgetRect,true);
textLabel->setFixedSize(200, 120);
//TODO check if the effects still be broken in OSX yet
#ifndef Q_OS_MAC
this->setGraphicsEffect(effect);
#endif
layout->addWidget(textLabel);
setLayout(layout);
setFixedSize(200, 120);
updatePosition();
}
void NotificationsLabelWidget::paintEvent(QPaintEvent *)
{
QPainter painter(this);
painter.setRenderHint(QPainter::Antialiasing);
QPainterPath path;
path.addRoundedRect(QRectF(0, 0, width(), height()), 5.0, 5.0);
painter.setPen(Qt::NoPen);
painter.fillPath(path, QColor("#BB000000"));
painter.drawPath(path);
}
void NotificationsLabelWidget::flash()
{
updatePosition();
anim->stop();
anim->start();
setVisible(true);
}
void NotificationsLabelWidget::setText(const QString & text)
{
textLabel->setText(text);
}
void NotificationsLabelWidget::updatePosition()
{
QWidget * parent = dynamic_cast<QWidget *>(this->parent());
if(parent == 0)
{
return;
}
move(QPoint((parent->geometry().size().width()-this->width())/2,(parent->geometry().size().height()-this->height())/2));
}

30
YACReader/notifications_label_widget.h Normal file
View File

@ -0,0 +1,30 @@
#ifndef NOTIFICATIONS_LABEL_WIDGET_H
#define NOTIFICATIONS_LABEL_WIDGET_H
#include <QWidget>
class QLabel;
class QPropertyAnimation;
class QGraphicsOpacityEffect;
class NotificationsLabelWidget : public QWidget
{
Q_OBJECT
private:
QLabel * textLabel;
QPropertyAnimation * anim;
QGraphicsOpacityEffect * effect;
protected:
void paintEvent(QPaintEvent *);
public:
NotificationsLabelWidget(QWidget * parent);
public slots:
void flash();
void setText(const QString & text);
void updatePosition();
};
#endif

324
YACReader/options_dialog.cpp Normal file
View File

@ -0,0 +1,324 @@
#include "options_dialog.h"
#include "configuration.h"
#include <QVBoxLayout>
#include <QHBoxLayout>
#include <QFileDialog>
#include <QGroupBox>
#include <QRadioButton>
#include <QTabWidget>
#include <QSlider>
#include <QLineEdit>
#include <QPushButton>
#include <QLabel>
#include <QColorDialog>
#include "yacreader_spin_slider_widget.h"
#include "yacreader_flow_config_widget.h"
#ifndef NO_OPENGL
#include "yacreader_gl_flow_config_widget.h"
#endif
OptionsDialog::OptionsDialog(QWidget * parent)
:YACReaderOptionsDialog(parent)
{
QTabWidget * tabWidget = new QTabWidget();
QVBoxLayout * layout = new QVBoxLayout(this);
QWidget * pageGeneral = new QWidget();
QWidget * pageFlow = new QWidget();
QWidget * pageImage = new QWidget();
QVBoxLayout * layoutGeneral = new QVBoxLayout();
QVBoxLayout * layoutFlow = new QVBoxLayout();
QVBoxLayout * layoutImageV = new QVBoxLayout();
QGridLayout * layoutImage = new QGridLayout();
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/find_folder.png"),""));
pathBox->setLayout(path);
connect(pathFindButton,SIGNAL(clicked()),this,SLOT(findFolder()));
//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);
//connect(fitToWidthRatioS,SIGNAL(valueChanged(int)),this,SLOT(fitToWidthRatio(int)));
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->setStretchFactor(backgroundColor,1);
colorSelection->setStretchFactor(selectBackgroundColorButton,0);
//colorSelection->addStretch();
connect(selectBackgroundColorButton, SIGNAL(clicked()), colorDialog, SLOT(show()));
colorBox->setLayout(colorSelection);
brightnessS = new YACReaderSpinSliderWidget(this,true);
brightnessS->setRange(0,100);
//brightnessS->setText(tr("Brightness"));
brightnessS->setTracking(false);
connect(brightnessS,SIGNAL(valueChanged(int)),this,SLOT(brightnessChanged(int)));
contrastS = new YACReaderSpinSliderWidget(this,true);
contrastS->setRange(0,250);
//contrastS->setText(tr("Contrast"));
contrastS->setTracking(false);
connect(contrastS,SIGNAL(valueChanged(int)),this,SLOT(contrastChanged(int)));
gammaS = new YACReaderSpinSliderWidget(this,true);
gammaS->setRange(0,250);
//gammaS->setText(tr("Gamma"));
gammaS->setTracking(false);
connect(gammaS,SIGNAL(valueChanged(int)),this,SLOT(gammaChanged(int)));
//connect(brightnessS,SIGNAL(valueChanged(int)),this,SIGNAL(changedOptions()));
quickNavi = new QCheckBox(tr("Quick Navigation Mode"));
disableShowOnMouseOver = new QCheckBox(tr("Disable mouse over activation"));
QHBoxLayout * buttons = new QHBoxLayout();
buttons->addStretch();
buttons->addWidget(new QLabel(tr("Restart is needed")));
buttons->addWidget(accept);
buttons->addWidget(cancel);
layoutGeneral->addWidget(pathBox);
layoutGeneral->addWidget(slideSizeBox);
//layoutGeneral->addWidget(fitBox);
layoutGeneral->addWidget(colorBox);
layoutGeneral->addWidget(shortcutsBox);
layoutGeneral->addStretch();
layoutFlow->addWidget(sw);
#ifndef NO_OPENGL
layoutFlow->addWidget(gl);
layoutFlow->addWidget(useGL);
#endif
layoutFlow->addWidget(quickNavi);
layoutFlow->addWidget(disableShowOnMouseOver);
layoutFlow->addStretch();
layoutImage->addWidget(new QLabel(tr("Brightness")),0,0);
layoutImage->addWidget(new QLabel(tr("Contrast")),1,0);
layoutImage->addWidget(new QLabel(tr("Gamma")),2,0);
layoutImage->addWidget(brightnessS,0,1);
layoutImage->addWidget(contrastS,1,1);
layoutImage->addWidget(gammaS,2,1);
QPushButton * pushButton = new QPushButton(tr("Reset"));
connect(pushButton,SIGNAL(pressed()),this,SLOT(resetImageConfig()));
layoutImage->addWidget(pushButton,3,0);
layoutImage->setColumnStretch(1,1);
QGroupBox *imageBox = new QGroupBox(tr("Image options"));
imageBox->setLayout(layoutImage);
layoutImageV->addWidget(imageBox);
layoutImageV->addStretch();
pageGeneral->setLayout(layoutGeneral);
pageFlow->setLayout(layoutFlow);
pageImage->setLayout(layoutImageV);
tabWidget->addTab(pageGeneral,tr("General"));
tabWidget->addTab(pageFlow,tr("Page Flow"));
tabWidget->addTab(pageImage,tr("Image adjustment"));
layout->addWidget(tabWidget);
layout->addLayout(buttons);
setLayout(layout);
//disable vSyncCheck
#ifndef NO_OPENGL
gl->vSyncCheck->hide();
#endif
//restoreOptions(); //load options
//resize(400,0);
setModal (true);
setWindowTitle(tr("Options"));
this->layout()->setSizeConstraint(QLayout::SetFixedSize);
}
void OptionsDialog::findFolder()
{
QString s = QFileDialog::getExistingDirectory(0,tr("Comics directory"),".");
if(!s.isEmpty())
{
pathEdit->setText(s);
}
}
void OptionsDialog::saveOptions()
{
settings->setValue(GO_TO_FLOW_SIZE,QSize(static_cast<int>(slideSize->sliderPosition()/SLIDE_ASPECT_RATIO),slideSize->sliderPosition()));
if(sw->radio1->isChecked())
settings->setValue(FLOW_TYPE_SW,0);
if(sw->radio2->isChecked())
settings->setValue(FLOW_TYPE_SW,1);
if(sw->radio3->isChecked())
settings->setValue(FLOW_TYPE_SW,2);
settings->setValue(PATH,pathEdit->text());
settings->setValue(BACKGROUND_COLOR,colorDialog->currentColor());
//settings->setValue(FIT_TO_WIDTH_RATIO,fitToWidthRatioS->sliderPosition()/100.0);
settings->setValue(QUICK_NAVI_MODE,quickNavi->isChecked());
settings->setValue(DISABLE_MOUSE_OVER_GOTO_FLOW,disableShowOnMouseOver->isChecked());
YACReaderOptionsDialog::saveOptions();
}
void OptionsDialog::restoreOptions(QSettings * settings)
{
YACReaderOptionsDialog::restoreOptions(settings);
slideSize->setSliderPosition(settings->value(GO_TO_FLOW_SIZE).toSize().height());
switch(settings->value(FLOW_TYPE_SW).toInt())
{
case 0:
sw->radio1->setChecked(true);
break;
case 1:
sw->radio2->setChecked(true);
break;
case 2:
sw->radio3->setChecked(true);
break;
default:
sw->radio1->setChecked(true);
break;
}
pathEdit->setText(settings->value(PATH).toString());
updateColor(settings->value(BACKGROUND_COLOR).value<QColor>());
//fitToWidthRatioS->setSliderPosition(settings->value(FIT_TO_WIDTH_RATIO).toFloat()*100);
quickNavi->setChecked(settings->value(QUICK_NAVI_MODE).toBool());
disableShowOnMouseOver->setChecked(settings->value(DISABLE_MOUSE_OVER_GOTO_FLOW).toBool());
brightnessS->setValue(settings->value(BRIGHTNESS,0).toInt());
contrastS->setValue(settings->value(CONTRAST,100).toInt());
gammaS->setValue(settings->value(GAMMA,100).toInt());
}
void OptionsDialog::updateColor(const QColor & color)
{
QPalette pal = backgroundColor->palette();
pal.setColor(backgroundColor->backgroundRole(), color);
backgroundColor->setPalette(pal);
backgroundColor->setAutoFillBackground(true);
colorDialog->setCurrentColor(color);
settings->setValue(BACKGROUND_COLOR,color);
emit(changedOptions());
}
/*void OptionsDialog::fitToWidthRatio(int value)
{
Configuration::getConfiguration().setFitToWidthRatio(value/100.0);
emit(fitToWidthRatioChanged(value/100.0));
}*/
void OptionsDialog::brightnessChanged(int value)
{
QSettings settings(YACReader::getSettingsPath()+"/YACReader.ini",QSettings::IniFormat);
settings.setValue(BRIGHTNESS,value);
emit changedFilters(brightnessS->getValue(), contrastS->getValue(), gammaS->getValue());
//emit(changedImageOptions());
}
void OptionsDialog::contrastChanged(int value)
{
QSettings settings(YACReader::getSettingsPath()+"/YACReader.ini",QSettings::IniFormat);
settings.setValue(CONTRAST,value);
emit changedFilters(brightnessS->getValue(), contrastS->getValue(), gammaS->getValue());
///emit(changedImageOptions());
}
void OptionsDialog::gammaChanged(int value)
{
QSettings settings(YACReader::getSettingsPath()+"/YACReader.ini",QSettings::IniFormat);
settings.setValue(GAMMA,value);
emit changedFilters(brightnessS->getValue(), contrastS->getValue(), gammaS->getValue());
//emit(changedImageOptions());
}
void OptionsDialog::resetImageConfig()
{
brightnessS->setValue(0);
contrastS->setValue(100);
gammaS->setValue(100);
QSettings settings(YACReader::getSettingsPath()+"/YACReader.ini",QSettings::IniFormat);
settings.setValue(BRIGHTNESS,0);
settings.setValue(CONTRAST,100);
settings.setValue(GAMMA,100);
emit changedFilters(brightnessS->getValue(), contrastS->getValue(), gammaS->getValue());
//emit(changedImageOptions());
}
void OptionsDialog::show()
{
//TODO solucionar el tema de las settings, esto sólo debería aparecer en una única línea de código
QSettings *s = new QSettings(YACReader::getSettingsPath()+"/YACReader.ini",QSettings::IniFormat);
//fitToWidthRatioS->disconnect();
//fitToWidthRatioS->setSliderPosition(settings->value(FIT_TO_WIDTH_RATIO).toFloat()*100);
//connect(fitToWidthRatioS,SIGNAL(valueChanged(int)),this,SLOT(fitToWidthRatio(int)));
QDialog::show();
delete s;
}
void OptionsDialog::setFilters(int brightness, int contrast, int gamma)
{
if(brightness != -1)
brightnessS->setValue(brightness);
else
brightnessS->setValue(0);
if(contrast != -1)
contrastS->setValue(contrast);
else
contrastS->setValue(100);
if(gamma != -1)
gammaS->setValue(gamma);
else
gammaS->setValue(100);
}

72
YACReader/options_dialog.h Normal file
View File

@ -0,0 +1,72 @@
#ifndef __OPTIONS_DIALOG_H
#define __OPTIONS_DIALOG_H
#include "yacreader_options_dialog.h"
class QDialog;
class QLabel;
class QLineEdit;
class QPushButton;
class QSlider;
class QPushButton;
class QRadioButton;
class QColorDialog;
class YACReaderSpinSliderWidget;
class OptionsDialog : public YACReaderOptionsDialog
{
Q_OBJECT
public:
OptionsDialog(QWidget * parent = 0);
private:
//QLabel * pathLabel;
QLineEdit * pathEdit;
QPushButton * pathFindButton;
QCheckBox * quickNavi;
QCheckBox * disableShowOnMouseOver;
QLabel * magGlassSizeLabel;
QLabel * zoomLevel;
//QLabel * slideSizeLabel;
QSlider * slideSize;
//QLabel * fitToWidthRatioLabel;
//QSlider * fitToWidthRatioS;
QLabel * backgroundColor;
QPushButton * selectBackgroundColorButton;
QColorDialog * colorDialog;
YACReaderSpinSliderWidget * brightnessS;
YACReaderSpinSliderWidget * contrastS;
YACReaderSpinSliderWidget * gammaS;
public slots:
void saveOptions();
void restoreOptions(QSettings * settings);
void findFolder();
void updateColor(const QColor & color);
//void fitToWidthRatio(int value);
void brightnessChanged(int value);
void contrastChanged(int value);
void gammaChanged(int value);
void resetImageConfig();
void show();
void setFilters(int brightness, int contrast, int gamma);
signals:
void changedOptions();
void changedImageOptions();
void changedFilters(int brightness, int contrast, int gamma);
//void fitToWidthRatioChanged(float ratio);
};
#endif

105
YACReader/page_label_widget.cpp Normal file
View File

@ -0,0 +1,105 @@
#include "page_label_widget.h"
#include <QtWidgets>
PageLabelWidget::PageLabelWidget(QWidget * parent)
:QWidget(parent)
{
animation = new QPropertyAnimation(this,"pos");
animation->setDuration(150);
animation->setEndValue(QPoint((parent->geometry().size().width()-this->width()),-this->height()));
int verticalRes = QApplication::desktop()->screenGeometry().height();
QHBoxLayout *layout = new QHBoxLayout;
layout->setMargin(0);
setContentsMargins(0,0,0,0);
QSize labelSize;
if (verticalRes <= 1024)
labelSize = QSize(135, 30);
else if (verticalRes <= 1200)
labelSize = QSize(170, 35);
else
labelSize = QSize(205, 45);
textLabel = new QLabel(this);
textLabel->setAlignment(Qt::AlignVCenter|Qt::AlignHCenter);
if(verticalRes <= 1024)
textLabel->setStyleSheet("QLabel { color : white; font-size:12px; padding-left:8px; }");
else if (verticalRes <= 1200)
textLabel->setStyleSheet("QLabel { color : white; font-size:16px; padding-left:8px;}");
else
textLabel->setStyleSheet("QLabel { color : white; font-size:20px; padding-left:8px; }");
setFixedSize(labelSize);
if(parent != 0)
move(QPoint((parent->geometry().size().width()-this->width()),-this->height()));
layout->addWidget(textLabel, 0 , Qt::AlignCenter);
setLayout(layout);
}
void PageLabelWidget::show()
{
if(this->pos().y() <= 0 && animation->state()!=QPropertyAnimation::Running)
{
QWidget * parent = dynamic_cast<QWidget *>(this->parent());
if(parent == 0)
{
return;
}
QWidget::show();
//connect(animation,SIGNAL(finished()),this,SLOT(QWidget::hide()));
animation->disconnect();
animation->setStartValue(QPoint((parent->geometry().size().width()-this->width()),-this->height()));
animation->setEndValue(QPoint((parent->geometry().size().width()-this->width()),0));
animation->start();
}
}
void PageLabelWidget::hide()
{
if(this->pos().y() >= 0 && animation->state()!=QPropertyAnimation::Running)
{
QWidget * parent = dynamic_cast<QWidget *>(this->parent());
if(parent == 0)
{
return;
}
//connect(animation,SIGNAL(finished()),this,SLOT(setHidden()));
animation->setStartValue(QPoint((parent->geometry().size().width()-this->width()),0));
animation->setEndValue(QPoint((parent->geometry().size().width()-this->width()),-this->height()));
animation->start();
}
}
void PageLabelWidget::setText(const QString & text)
{
textLabel->setText(text);
}
void PageLabelWidget::paintEvent(QPaintEvent *)
{
QPainter painter(this);
painter.fillRect(0,0,width(),height(),QColor("#BB000000"));
}
void PageLabelWidget::updatePosition()
{
QWidget * parent = dynamic_cast<QWidget *>(this->parent());
if(parent == 0)
{
return;
}
animation->stop();
if (animation->endValue().toPoint().y() == 0)
move(QPoint((parent->geometry().size().width()-this->width()),0));
else
move(QPoint((parent->geometry().size().width()-this->width()),-this->height()));
}

29
YACReader/page_label_widget.h Normal file
View File

@ -0,0 +1,29 @@
#ifndef PAGE_LABEL_WIDGET_H
#define PAGE_LABEL_WIDGET_H
#include <QWidget>
class QLabel;
class QPropertyAnimation;
class PageLabelWidget : public QWidget
{
Q_OBJECT
private:
QLabel * textLabel;
QPropertyAnimation * animation;
protected:
virtual void paintEvent(QPaintEvent *);
public:
PageLabelWidget(QWidget * parent);
public slots:
void show();
void hide();
void setText(const QString & text);
void updatePosition();
};
#endif

1199
YACReader/render.cpp Normal file
View File

File diff suppressed because it is too large Load Diff

216
YACReader/render.h Normal file
View File

@ -0,0 +1,216 @@
#ifndef RENDER_H
#define RENDER_H
#include <QImage>
#include <QPixmap>
#include <QPainter>
#include <QThread>
#include <QByteArray>
#include <QVector>
#include "comic.h"
//-----------------------------------------------------------------------------
// FILTERS
//-----------------------------------------------------------------------------
#include <QThread>
class Comic;
class ComicDB;
class Render;
class ImageFilter {
public:
ImageFilter(){};
virtual ~ImageFilter() {};
virtual QImage setFilter(const QImage & image) = 0;
inline int getLevel() {return level;};
inline void setLevel(int l) {level = l;};
protected:
int level;
};
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=-1);
virtual QImage setFilter(const QImage & image);
};
class ContrastFilter : public ImageFilter {
public:
ContrastFilter(int l=-1);
virtual QImage setFilter(const QImage & image);
};
class GammaFilter : public ImageFilter {
public:
GammaFilter(int l=-1);
virtual QImage setFilter(const QImage & image);
};
//-----------------------------------------------------------------------------
// RENDER
//-----------------------------------------------------------------------------
class PageRender : public QThread
{
Q_OBJECT
public:
PageRender();
PageRender(Render * render,int numPage, const QByteArray & rawData, QImage * page,unsigned int degrees=0, QVector<ImageFilter *> filters = QVector<ImageFilter *>());
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<ImageFilter *> f){filters = f;};
private:
int numPage;
QByteArray data;
QImage * page;
unsigned int degrees;
QVector<ImageFilter *> filters;
void run();
Render * render;
signals:
void pageReady(int);
};
//-----------------------------------------------------------------------------
// RENDER
//-----------------------------------------------------------------------------
/*class DoublePageRender : public PageRender
{
Q_OBJECT
public:
DoublePageRender(Render * render, int firstPage, const QByteArray & firstPageData,const QByteArray & secondPageData, QImage * page,unsigned int degrees=0, QVector<ImageFilter *> filters = QVector<ImageFilter *>());
private:
int numPage;
QByteArray data;
QByteArray data2;
QImage * page;
unsigned int degrees;
QVector<ImageFilter *> filters;
void run();
Render * render;
signals:
void pageReady(int);
};
*/
class Render : public QObject {
Q_OBJECT
public:
Render();
~Render();
public slots:
void render();
QPixmap * getCurrentPage();
QPixmap * getCurrentDoublePage();
QPixmap * getCurrentDoubleMangaPage();
bool currentPageIsDoublePage();
bool nextPageIsDoublePage();
bool previousPageIsDoublePage();
void goTo(int index);
void doublePageSwitch();
void doubleMangaPageSwitch();
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 nextDoublePage();
void previousDoublePage();
void load(const QString & path, const ComicDB & comic);
void load(const QString & path, int atPage);
void createComic(const QString & path);
void loadComic(const QString & path,const ComicDB & comic);
void loadComic(const QString & path, int atPage);
void startLoad();
void rotateRight();
void rotateLeft();
unsigned int getIndex();
unsigned int numPages();
bool hasLoadedComic();
void updateBuffer();
void fillBuffer();
void invalidate();
QString getCurrentPagesInformation();
void setBookmark();
void removeBookmark();
void save();
void reset();
void reload();
void updateFilters(int brightness, int contrast, int gamma);
Bookmarks * getBookmarks();
//sets the firt page to render
void renderAt(int page);
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 errorOpening(QString);
void crcError(QString);
void currentPageIsBookmark(bool);
void isLast();
void isCover();
void bookmarksUpdated();
private:
Comic * comic;
bool doublePage;
bool doubleMangaPage;
int previousIndex;
int currentIndex;
//QPixmap * currentPage;
int currentPageBufferedIndex;
int numLeftPages;
int numRightPages;
QList<PageRender *> pageRenders;
QList<QImage *> buffer;
void loadAll();
void updateRightPages();
void updateLeftPages();
bool loadedComic;
QList<int> pagesEmited;
QVector<bool> pagesReady;
int imageRotation;
QVector<ImageFilter *> filters;
QMutex mutex;
friend class PageRender;
};
#endif // RENDER_H

55
YACReader/shortcuts_dialog.cpp Normal file
View File

@ -0,0 +1,55 @@
#include "shortcuts_dialog.h"
#include <QVBoxLayout>
#include <QPushButton>
#include <QTextEdit>
#include <QLabel>
#include <QPixmap>
#include <QFile>
#include <QTextStream>
#include <QTextCodec>
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();
shortcuts->setFrameStyle(QFrame::NoFrame);
//"<p><b>General functions:</b><hr/><b>O</b> : Open comic<br/><b>Esc</b> : Exit</p>"
shortcuts->setReadOnly(true);
shortcutsLayout->addWidget(shortcuts);
//shortcutsLayout->addWidget(shortcuts2);
shortcutsLayout->setSpacing(0);
mainLayout->addLayout(shortcutsLayout);
mainLayout->addLayout(bottomLayout);
setLayout(mainLayout);
setFixedSize(QSize(700,500));
QFile f(":/files/shortcuts.html");
f.open(QIODevice::ReadOnly);
QTextStream txtS(&f);
txtS.setCodec(QTextCodec::codecForName("UTF-8"));
QString content = txtS.readAll();
f.close();
shortcuts->setHtml(content);
setWindowTitle(tr("Keyboard Shortcuts"));
}

19
YACReader/shortcuts_dialog.h Normal file
View File

@ -0,0 +1,19 @@
#ifndef SHORTCUTS_DIALOG_H
#define SHORTCUTS_DIALOG_H
#include <QDialog>
#include <QTextEdit>
#include <QPushButton>
class ShortcutsDialog : public QDialog
{
Q_OBJECT
public:
ShortcutsDialog(QWidget * parent = 0);
private:
QTextEdit * shortcuts;
QPushButton * close;
public slots:
};
#endif // SHORTCUTS_DIALOG_H

429
YACReader/translator.cpp Normal file
View File

@ -0,0 +1,429 @@
#include <QUrl>
#if QT_VERSION >= 0x050000
#include <QMediaPlayer>
#else
#include <Phonon/MediaObject>
#include <Phonon/MediaSource>
#endif
#include <QPushButton>
#include <QPalette>
#include <QMouseEvent>
#include <QHBoxLayout>
#include <QVBoxLayout>
#include "translator.h"
#include "yacreader_busy_widget.h"
#include <QFile>
#include <QPoint>
#include <QWidget>
#include <QTextCodec>
#include <QLabel>
#include <QTextEdit>
#include <QComboBox>
#include <QThread>
#include <QEventLoop>
#include <QTimer>
#include <QNetworkRequest>
#include <QNetworkReply>
#include <QMessageBox>
#define APPID "417CEAD93449502CC3C9B69FED26C54118E62BCC"
YACReaderTranslator::YACReaderTranslator(QWidget * parent)
:QWidget(parent),drag(false)
{
QString scrollBarStyle = "QScrollBar:vertical { border: none; background: #404040; width: 7px; margin: 0 3px 0 0; }"
"QScrollBar::handle:vertical { background: #DDDDDD; width: 7px; min-height: 20px; }"
"QScrollBar::add-line:vertical { border: none; background: #404040; height: 10px; subcontrol-position: bottom; subcontrol-origin: margin; margin: 0 3px 0 0;}"
"QScrollBar::sub-line:vertical { border: none; background: #404040; height: 10px; subcontrol-position: top; subcontrol-origin: margin; margin: 0 3px 0 0;}"
"QScrollBar::up-arrow:vertical {border:none;width: 9px;height: 6px;background: url(':/images/folders_view/line-up.png') center top no-repeat;}"
"QScrollBar::down-arrow:vertical {border:none;width: 9px;height: 6px;background: url(':/images/folders_view/line-down.png') center top no-repeat;}"
"QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical {background: none; }";
this->setCursor(QCursor(Qt::ArrowCursor));
this->setAutoFillBackground(true);
this->setBackgroundRole(QPalette::Window);
QPalette p(this->palette());
p.setColor(QPalette::Window, QColor("#404040"));
this->setPalette(p);
QVBoxLayout *layout = new QVBoxLayout(this);
//TITLE BAR
QHBoxLayout * titleBar = new QHBoxLayout();
QPushButton * close = new QPushButton(QIcon(QPixmap(":/images/close.png")),"");
close->setFlat(true);
QLabel * title = new QLabel(tr("YACReader translator"));
title->setStyleSheet("QLabel {font-size:18px; font-family:Arial; color:white;}");
titleBar->addWidget(title);
titleBar->addStretch();
close->resize(14,14);
close->setStyleSheet("QPushButton {margin:0;padding:0;border:none;}");
titleBar->addWidget(close);
titleBar->setContentsMargins(0,0,0,0);
titleBar->setSpacing(0);
connect(close,SIGNAL(clicked()),this->parent(),SLOT(animateHideTranslator()));
layout->addLayout(titleBar);
//INPUT TEXT
text = new QTextEdit(this);
text->setMinimumHeight(110);
text->setMaximumHeight(110);
layout->addSpacing(12);
layout->addWidget(text);
text->setStyleSheet("QTextEdit{border:none;background:#2a2a2a;color:white; font-size:12px; padding:6px;}"+scrollBarStyle);
//COMBOBOXES
QHBoxLayout * combos = new QHBoxLayout();
from = new QComboBox(this);
to = new QComboBox(this);
QString comboBoxStyle = "QComboBox {border:none;background:#2a2a2a;color:white;font-size:12px;font-family:Arial;padding-left:8px;}"
"QComboBox::down-arrow {image: url(:/images/dropDownArrow.png);}"
"QComboBox::drop-down {border:none; padding-right:10px;}"
"QComboBox QAbstractItemView {border: none; background:#272727; color:white; selection-background-color: #202020; outline:none;}"
"QComboBox QAbstractItemView::item {padding-left:8px;}" + scrollBarStyle
;
from->setStyleSheet(comboBoxStyle);
to->setStyleSheet(comboBoxStyle);
from->setFixedHeight(22);
to->setFixedHeight(22);
QLabel * arrow = new QLabel(this);
QPixmap arrowPixmap(":/images/fromTo.png");
arrow->setPixmap(arrowPixmap);
QPushButton * searchButton = new QPushButton(this);
searchButton->setIcon(QIcon(":/images/translatorSearch.png"));
searchButton->setStyleSheet("QPushButton {border:none; background:#2a2a2a;}");
searchButton->setFixedSize(22,22);
combos->addWidget(from,1);
combos->addSpacing(9);
combos->addWidget(arrow,0);
combos->addSpacing(9);
combos->addWidget(to,1);
combos->addSpacing(9);
combos->addWidget(searchButton,0);
layout->addSpacing(12);
layout->addLayout(combos);
//RESULTS
QHBoxLayout * resultsTitleLayout = new QHBoxLayout();
resultsTitle = new QLabel(tr("Translation"));
resultsTitle->setStyleSheet("QLabel {font-family:Arial;font-size:14px;color:#e3e3e3;}");
speakButton = new QPushButton(this);
speakButton->setStyleSheet("QPushButton {border:none;}");
speakButton->setIcon(QIcon(":/images/speaker.png"));
resultsTitleLayout->addWidget(resultsTitle,0,Qt::AlignVCenter);
resultsTitleLayout->addSpacing(10);
resultsTitleLayout->addWidget(speakButton,0,Qt::AlignVCenter);
resultsTitleLayout->addStretch();
layout->addSpacing(15);
layout->addLayout(resultsTitleLayout);
layout->addSpacing(12);
resultText = new QLabel();
resultText->setWordWrap(true);
resultText->setStyleSheet("QLabel {color:white;font-size:12px;}");
resultText->setText("ñlkas lakj dflkaj lasd jflie lkajd fie kljads ijef lasei afsliej ljse f");
layout->addWidget(resultText);
layout->addStretch();
//CLEAR BUTTON
clearButton = new QPushButton(tr("clear"));
layout->addWidget(clearButton,0,Qt::AlignRight);
clearButton->setMinimumWidth(95);
clearButton->setStyleSheet("QPushButton {border:1px solid #212121; background:#2a2a2a; color:white; font-family:Arial; font-size:12px; padding-top:5px; padding-bottom:5px;}");
resize(400,479);
layout->setMargin(0);
layout->setContentsMargins(18,12,18,12);
setContentsMargins(0,0,0,0);
layout->setSpacing(0);
hideResults();
populateCombos();
busyIndicator = new YACReaderBusyWidget(this);
busyIndicator->move((this->width()-busyIndicator->width())/2,(this->height()-busyIndicator->height())*2/3);
busyIndicator->hide();
show();
connect(searchButton,SIGNAL(pressed()),this,SLOT(translate()));
connect(speakButton,SIGNAL(pressed()),this,SLOT(play()));
connect(clearButton,SIGNAL(pressed()),this,SLOT(clear()));
//multimedia/phonon
#if QT_VERSION >= 0x050000
player = new QMediaPlayer;
#else
music = createPlayer(MusicCategory);
#endif
}
void YACReaderTranslator::hideResults()
{
resultsTitle->setHidden(true);
speakButton->setHidden(true);
resultText->setHidden(true);
}
void YACReaderTranslator::clear()
{
hideResults();
text->clear();
}
void YACReaderTranslator::translate()
{
QString text = this->text->toPlainText();
if(text.isEmpty())
return;
QString from = this->from->itemData(this->from->currentIndex()).toString();
QString to = this->to->itemData(this->to->currentIndex()).toString();
TranslationLoader * translationLoader = new TranslationLoader(text,from,to);
connect(translationLoader,SIGNAL(requestFinished(QString)),this,SLOT(setTranslation(QString)));
connect(translationLoader,SIGNAL(error()),this,SLOT(error()));
connect(translationLoader,SIGNAL(timeOut()),this,SLOT(error()));
connect(translationLoader,SIGNAL(finished()),translationLoader,SLOT(deleteLater()));
TextToSpeachLoader * tts = new TextToSpeachLoader(text,from);
connect(tts,SIGNAL(requestFinished(QUrl)),this,SLOT(setSpeak(QUrl)));
connect(tts,SIGNAL(error()),this,SLOT(error()));
connect(tts,SIGNAL(timeOut()),this,SLOT(error()));
connect(tts,SIGNAL(finished()),tts,SLOT(deleteLater()));
translationLoader->start();
tts->start();
resultsTitle->setText(tr("Translation"));
hideResults();
busyIndicator->show();
}
void YACReaderTranslator::error()
{
resultsTitle->setText(tr("Service not available"));
resultsTitle->setHidden(false);
busyIndicator->hide();
}
void YACReaderTranslator::setSpeak(const QUrl & url)
{
resultsTitle->setHidden(false);
speakButton->setHidden(false);
ttsSource = url;
}
void YACReaderTranslator::setTranslation(const QString & string)
{
resultText->setText(string);
resultsTitle->setHidden(false);
resultText->setHidden(false);
busyIndicator->hide();
}
void YACReaderTranslator::populateCombos()
{
QList<QComboBox *> combos;
combos.append(from);
combos.append(to);
for(int i=0;i<combos.count();i++)
{
QComboBox * combo = combos.at(i);
combo->addItem("Arabic","ar");
combo->addItem("Bulgarian","bg");
combo->addItem("Catalan","ca");
combo->addItem("Chinese Simplified","zh-CHS");
combo->addItem("Chinese Traditional","zh-CHT");
combo->addItem("Czech","cs");
combo->addItem("Danish","da");
combo->addItem("Dutch","nl");
combo->addItem("English","en");
combo->addItem("Estonian","et");
combo->addItem("Finnish","fi");
combo->addItem("French","fr");
combo->addItem("German","de");
combo->addItem("Greek","el");
combo->addItem("Haitian Creole","ht");
combo->addItem("Hebrew","he");
combo->addItem("Hindi","hi");
combo->addItem("Hungarian","hu");
combo->addItem("Indonesian","id");
combo->addItem("Italian","it");
combo->addItem("Japanese","ja");
combo->addItem("Korean","ko");
combo->addItem("Latvian","lv");
combo->addItem("Lithuanian","lt");
combo->addItem("Norwegian","no");
combo->addItem("Polish","pl");
combo->addItem("Portuguese","pt");
combo->addItem("Romanian","ro");
combo->addItem("Russian","ru");
combo->addItem("Slovak","sk");
combo->addItem("Slovenian","sl");
combo->addItem("Spanish","es");
combo->addItem("Swedish","sv");
combo->addItem("Thai","th");
combo->addItem("Turkish","tr");
combo->addItem("Ukrainian","uk");
combo->addItem("Vietnamese","vi");
}
from->setCurrentIndex(from->findText("English"));
to->setCurrentIndex(from->findText("Spanish"));
}
void YACReaderTranslator::play()
{
//QMessageBox::question(this,"xxx",ttsSource.toString());
#if QT_VERSION >= 0x050000
player->setMedia(ttsSource);
player->play();
#else
MediaSource src(ttsSource);
src.setAutoDelete(true);
music->setCurrentSource(src);
music->play();
#endif
}
YACReaderTranslator::~YACReaderTranslator()
{
#if QT_VERSION >= 0x050000
#else
delete music;
#endif
}
void YACReaderTranslator::mousePressEvent(QMouseEvent *event)
{
QPoint p = mapTo(this,event->pos());
if(p.y() < 40)
{
drag = true;
click = event->pos();
}
}
void YACReaderTranslator::mouseReleaseEvent(QMouseEvent *event)
{
drag = false;
event->accept();
}
void YACReaderTranslator::mouseMoveEvent(QMouseEvent * event)
{
if(drag)
this->move(QPoint(mapToParent(event->pos())-click));
event->accept();
}
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
TranslationLoader::TranslationLoader(QString text, QString from, QString to)
:QThread(),text(text),from(from),to(to)
{
}
void TranslationLoader::run()
{
QNetworkAccessManager manager;
QEventLoop q;
QTimer tT;
tT.setSingleShot(true);
connect(&tT, SIGNAL(timeout()), &q, SLOT(quit()));
connect(&manager, SIGNAL(finished(QNetworkReply*)),&q, SLOT(quit()));
QString url = "http://api.microsofttranslator.com/V2/Ajax.svc/Translate?appid=%1&from=%2&to=%3&text=%4&contentType=text/plain";
url = url.arg(APPID).arg(from).arg(to).arg(text);
QNetworkReply *reply = manager.get(QNetworkRequest(QUrl(url)));
tT.start(5000); // 5s timeout
q.exec();
if(tT.isActive()){
// download complete
if(reply->error() == QNetworkReply::NoError)
{
QString utf8 = QString::fromUtf8(reply->readAll());
utf8 = utf8.remove(0,1);
utf8 = utf8.remove(utf8.count()-1,1);
QString translated(utf8);
emit(requestFinished(translated));
}
else
emit(error());
} else {
emit(timeOut());
}
}
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
TextToSpeachLoader::TextToSpeachLoader(QString text, QString language)
:QThread(),text(text),language(language)
{
}
void TextToSpeachLoader::run()
{
QNetworkAccessManager manager;
QEventLoop q;
QTimer tT;
tT.setSingleShot(true);
connect(&tT, SIGNAL(timeout()), &q, SLOT(quit()));
connect(&manager, SIGNAL(finished(QNetworkReply*)),&q, SLOT(quit()));
QString url = "http://api.microsofttranslator.com/V2/Ajax.svc/Speak?appid=%1&language=%2&text=%3&contentType=text/plain";
url = url.arg(APPID).arg(language).arg(text);
QNetworkReply *reply = manager.get(QNetworkRequest(QUrl(url)));
tT.start(5000); // 5s timeout
q.exec();
if(tT.isActive()){
// download complete
if(reply->error() == QNetworkReply::NoError)
{
QString utf8 = QString::fromUtf8(reply->readAll());
utf8 = utf8.remove(0,1);
utf8 = utf8.remove(utf8.count()-1,1);
utf8 = utf8.replace("\\","");
emit(requestFinished(QUrl(utf8)));
}
else
emit(error());
} else {
emit(timeOut());
}
}

102
YACReader/translator.h Normal file
View File

@ -0,0 +1,102 @@
#ifndef __TRANSLATOR_H
#define __TRANSLATOR_H
class QUrl;
class QMouseEvent;
class QPoint;
class QTextEdit;
class QComboBox;
class QLabel;
class QPushButton;
class YACReaderBusyWidget;
#include <QWidget>
#include <QThread>
#include <QUrl>
#if QT_VERSION >= 0x050000
class QMediaPlayer;
#else
#include<Phonon/MediaObject>
using namespace Phonon;
#endif
class YACReaderTranslator : public QWidget
{
Q_OBJECT
public:
YACReaderTranslator(QWidget * parent = 0);
~YACReaderTranslator();
public slots:
void play();
protected slots:
void translate();
void setSpeak(const QUrl & url);
void setTranslation(const QString & string);
void error();
void clear();
protected:
void mousePressEvent(QMouseEvent *event);
void mouseReleaseEvent(QMouseEvent *event);
void mouseMoveEvent ( QMouseEvent * event );
void hideResults();
void populateCombos();
bool drag;
QPoint click;
private:
#if QT_VERSION >= 0x050000
QMediaPlayer *player;
#else
MediaObject * music;
#endif
QTextEdit * text;
QComboBox * from;
QComboBox * to;
QLabel * resultsTitle;
QPushButton * speakButton;
QLabel * resultText;
YACReaderBusyWidget * busyIndicator;
QUrl ttsSource;
QPushButton * clearButton;
};
class TranslationLoader : public QThread
{
Q_OBJECT
public:
TranslationLoader(QString text, QString from, QString to);
signals:
void requestFinished(QString);
void timeOut();
void error();
private:
QString text;
QString from;
QString to;
void run();
};
class TextToSpeachLoader : public QThread
{
Q_OBJECT
public:
TextToSpeachLoader(QString text, QString language);
signals:
void requestFinished(QUrl);
void timeOut();
void error();
private:
QString text;
QString language;
void run();
};
#endif

1224
YACReader/viewer.cpp Normal file
View File

File diff suppressed because it is too large Load Diff

189
YACReader/viewer.h Normal file
View File

@ -0,0 +1,189 @@
#ifndef __VIEWER_H
#define __VIEWER_H
#include <QMainWindow>
#include <QScrollArea>
#include <QAction>
#include <QTimer>
#include <QLabel>
#include <QPixmap>
#include <QKeyEvent>
#include <QResizeEvent>
#include <QWheelEvent>
#include <QMouseEvent>
#include <QCloseEvent>
#include <QPropertyAnimation>
#include <QParallelAnimationGroup>
#include <QSettings>
#include "scroll_management.h"
class ComicDB;
class Comic;
class MagnifyingGlass;
class GoToFlow;
class BookmarksDialog;
class Render;
class GoToDialog;
class YACReaderTranslator;
class GoToFlowWidget;
class Bookmarks;
class PageLabelWidget;
class NotificationsLabelWidget;
class Viewer : public QScrollArea, public ScrollManagement
{
Q_OBJECT
public:
bool fullscreen; //TODO, change by the right use of windowState();
public slots:
void increaseZoomFactor();
void decreaseZoomFactor();
void setZoomFactor(int);
int getZoomFactor();
void prepareForOpening();
void open(QString pathFile, int atPage = -1);
void open(QString pathFile, const ComicDB & comic);
void prev();
void next();
void showGoToDialog();
void goTo(unsigned int page);
void updatePage();
void updateContentSize();
void updateVerticalScrollBar();
void updateOptions();
void scrollDown();
void scrollUp();
void scrollForwardHorizontalFirst();
void scrollBackwardHorizontalFirst();
void scrollForwardVerticalFirst();
void scrollBackwardVerticalFirst();
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 doubleMangaPageSwitch();
void resetContent();
void setLoadingMessage();
void setPageUnavailableMessage();
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);
void updateConfig(QSettings * settings);
void showMessageErrorOpening();
void showMessageErrorOpening(QString);
void processCRCError(QString message);
void setBookmarks();
//deprecated
void updateImageOptions();
void updateFilters(int brightness, int contrast,int gamma);
void showIsCoverMessage();
void showIsLastMessage();
int getCurrentPageNumber();
void updateZoomRatio(int ratio);
private:
bool information;
bool doublePage;
bool doubleMangaPage;
int zoom;
PageLabelWidget * informationLabel;
//QTimer * scroller;
QPropertyAnimation * verticalScroller;
QPropertyAnimation * horizontalScroller;
QParallelAnimationGroup * groupScroller;
int posByStep;
int nextPos;
GoToFlowWidget * goToFlow;
QPropertyAnimation * showGoToFlowAnimation;
GoToDialog * goToDialog;
//!Image properties
//! Comic
//Comic * comic;
int index;
QPixmap *currentPage;
BookmarksDialog * bd;
bool wheelStop;
Render * render;
QTimer * hideCursorTimer;
int direction;
bool drag;
int numScrollSteps;
//!Widgets
QLabel *content;
YACReaderTranslator * translator;
int translatorXPos;
QPropertyAnimation * translatorAnimation;
int yDragOrigin;
int xDragOrigin;
NotificationsLabelWidget * notificationsLabel;
bool shouldOpenNext;
bool shouldOpenPrevious;
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);
//!ZigzagScroll
enum scrollDirection{ UP, DOWN, LEFT, RIGHT };
bool isEdge(scrollDirection d);
void scrollZigzag(scrollDirection d1, scrollDirection d2, bool forward);
void scrollTo(int x, int y);
public:
Viewer(QWidget * parent = 0);
~Viewer();
void toggleFullScreen();
const QPixmap * pixmap();
//Comic * getComic(){return comic;}
const BookmarksDialog * getBookmarksDialog(){return bd;}
//returns the current index starting in 1 [1,nPages]
unsigned int getIndex();
void updateComic(ComicDB & comic);
signals:
void backgroundChanges();
void pageAvailable(bool);
void pageIsBookmark(bool);
void reset();
void openNextComic();
void openPreviousComic();
void zoomUpdated(int);
};
#endif

111
YACReader/width_slider.cpp Normal file
View File

@ -0,0 +1,111 @@
#include "width_slider.h"
#include <QtWidgets>
#include "configuration.h"
YACReaderSliderAction::YACReaderSliderAction (QWidget * parent)
:QWidgetAction (parent) {
widget = new YACReaderSlider();
setDefaultWidget(widget);
connect(widget,SIGNAL(zoomRatioChanged(int)),this,SIGNAL(zoomRatioChanged(int)));
}
void YACReaderSliderAction::updateText(int value)
{
widget->updateText(value);
}
void YACReaderSliderAction::updateZoomRatio(int value)
{
widget->updateZoomRatio(value);
}
YACReaderSlider::YACReaderSlider(QWidget *parent)
:QWidget(parent)
{
const int sliderWidth = 200;
const int contentsMargin = 10;
const int elementsSpacing = 10;
const int percentageLabelWidth = 30;
setFocusPolicy(Qt::StrongFocus);
QHBoxLayout* pLayout = new QHBoxLayout();
pLayout->addStretch();
percentageLabel = new QLabel();
percentageLabel->setStyleSheet("QLabel { color : white; }");
percentageLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
slider = new QSlider();
slider->setOrientation(Qt::Horizontal);
slider->setMinimumWidth(sliderWidth);
QPushButton *resetButton = new QPushButton(tr("Reset"));
resetButton->setStyleSheet("QPushButton {border: 1px solid #BB242424; background: #BB2E2E2E; color:white; padding: 3px 5px 5px 5px;}");
connect(resetButton, &QPushButton::clicked, this, &YACReaderSlider::resetValueToDefault);
pLayout->addWidget(percentageLabel, 1, Qt::AlignHCenter);
pLayout->addWidget(slider, 0, Qt::AlignHCenter | Qt::AlignBottom);
pLayout->addWidget(resetButton, 1, Qt::AlignHCenter | Qt::AlignBottom);
pLayout->setSpacing(elementsSpacing);
pLayout->setMargin(0);
setLayout (pLayout);
setAutoFillBackground(false);
setContentsMargins(contentsMargin,contentsMargin,contentsMargin,contentsMargin);
setFixedSize(sliderWidth + 2 * contentsMargin + 2 * elementsSpacing + percentageLabelWidth + resetButton->sizeHint().width(), 45);
slider->setMinimum(30);
slider->setMaximum(500);
slider->setPageStep(5);
slider->setFocusPolicy(Qt::NoFocus);
resetButton->setFocusPolicy(Qt::NoFocus);
slider->setValue(100);
percentageLabel->setText(QString("%1%").arg(100));
connect(slider, &QSlider::valueChanged, this, &YACReaderSlider::updateText);
}
void YACReaderSlider::paintEvent(QPaintEvent *)
{
QPainter painter(this);
painter.fillRect(0,0,width(),height(),QColor("#BB000000"));
}
void YACReaderSlider::show()
{
QWidget::show();
setFocus();
}
void YACReaderSlider::focusOutEvent(QFocusEvent * event)
{
QWidget::focusOutEvent(event);
hide();
}
void YACReaderSlider::updateText(int value)
{
percentageLabel->setText(QString("%1%").arg(value));
emit zoomRatioChanged(value);
}
void YACReaderSlider::updateZoomRatio(int value)
{
slider->setValue(value);
percentageLabel->setText(QString("%1%").arg(value));
}
void YACReaderSlider::resetValueToDefault()
{
slider->setValue(100);
}

53
YACReader/width_slider.h Normal file
View File

@ -0,0 +1,53 @@
#ifndef WIDTH_SLIDER_H
#define WIDTH_SLIDER_H
#include <QWidgetAction>
class QLabel;
class QSlider;
class YACReaderSlider : public QWidget
{
Q_OBJECT
private:
QLabel * percentageLabel;
QSlider * slider;
public:
YACReaderSlider (QWidget * parent = 0);
void show();
protected:
virtual void focusOutEvent(QFocusEvent * event);
virtual void paintEvent(QPaintEvent *);
public slots:
void updateText(int value);
void updateZoomRatio(int value);
void resetValueToDefault();
signals:
void zoomRatioChanged(int value);
};
class YACReaderSliderAction : public QWidgetAction
{
Q_OBJECT
private:
YACReaderSlider * widget;
public:
YACReaderSliderAction (QWidget * parent = 0);
public slots:
void updateText(int value);
void updateZoomRatio(int value);
signals:
void zoomRatioChanged(int value);
};
#endif

1053
YACReader/yacreader_de.ts Normal file
View File

File diff suppressed because it is too large Load Diff

1054
YACReader/yacreader_es.ts Normal file
View File

File diff suppressed because it is too large Load Diff

12
YACReader/yacreader_files.qrc Normal file
View File

@ -0,0 +1,12 @@
<RCC>
<qresource>
<file>../files/about.html</file>
<file>../files/helpYACReader.html</file>
<file>../files/shortcuts.html</file>
</qresource>
<qresource lang="es_ES">
<file alias="/files/about.html">../files/about_es_ES.html</file>
<file alias="/files/helpYACReader.html">../files/helpYACReader_es_ES.html</file>
</qresource>
</RCC>

1053
YACReader/yacreader_fr.ts Normal file
View File

File diff suppressed because it is too large Load Diff

70
YACReader/yacreader_images.qrc Normal file
View File

@ -0,0 +1,70 @@
<RCC>
<qresource>
<file>../images/icon.png</file>
<file>../images/goto.png</file>
<file>../images/find_folder.png</file>
<file>../images/flow1.png</file>
<file>../images/flow2.png</file>
<file>../images/flow3.png</file>
<file>../images/flow4.png</file>
<file>../images/flow5.png</file>
<file>../images/notCover.png</file>
<file>../images/shortcuts.png</file>
<file>../images/close.png</file>
<file>../images/up.png</file>
<file>../images/down.png</file>
<file>../images/imgCenterSlide.png</file>
<file>../images/imgGoToSlide.png</file>
<file>../images/imgCenterSlidePressed.png</file>
<file>../images/imgGoToSlidePressed.png</file>
<file>../images/helpImages/open.png</file>
<file>../images/helpImages/openFolder.png</file>
<file>../images/helpImages/next.png</file>
<file>../images/helpImages/prev.png</file>
<file>../images/helpImages/icon.png</file>
<file>../images/helpImages/zoom.png</file>
<file>../images/helpImages/fit.png</file>
<file>../images/helpImages/goto.png</file>
<file>../images/helpImages/help.png</file>
<file>../images/helpImages/center.png</file>
<file>../images/helpImages/options.png</file>
<file>../images/helpImages/comicFolder.png</file>
<file>../images/helpImages/save.png</file>
<file>../images/helpImages/rotateL.png</file>
<file>../images/helpImages/rotateR.png</file>
<file>../images/helpImages/flow1.png</file>
<file>../images/helpImages/flow2.png</file>
<file>../images/helpImages/flow3.png</file>
<file>../images/helpImages/bookmark.png</file>
<file>../images/helpImages/setBookmark.png</file>
<file>../images/helpImages/notCover.png</file>
<file>../images/helpImages/previousComic.png</file>
<file>../images/helpImages/nextComic.png</file>
<file>../images/helpImages/deleteLibrary.png</file>
<file>../images/helpImages/properties.png</file>
<file>../images/helpImages/doublePage.png</file>
<file>../images/helpImages/keyboard.png</file>
<file>../images/helpImages/mouse.png</file>
<file>../images/helpImages/speaker.png</file>
<file>../images/defaultCover.png</file>
<file>../images/onStartFlowSelection.png</file>
<file>../images/onStartFlowSelection_es.png</file>
<file>../images/useNewFlowButton.png</file>
<file>../images/useOldFlowButton.png</file>
<file>../images/fromTo.png</file>
<file>../images/dropDownArrow.png</file>
<file>../images/translatorSearch.png</file>
<file>../images/speaker.png</file>
<file>../images/clear_shortcut.png</file>
<file>../images/accept_shortcut.png</file>
<file>../images/shortcuts_group_comics.png</file>
<file>../images/shortcuts_group_folders.png</file>
<file>../images/shortcuts_group_general.png</file>
<file>../images/shortcuts_group_libraries.png</file>
<file>../images/shortcuts_group_mglass.png</file>
<file>../images/shortcuts_group_page.png</file>
<file>../images/shortcuts_group_reading.png</file>
<file>../images/shortcuts_group_visualization.png</file>
</qresource>
</RCC>

61
YACReader/yacreader_images_osx.qrc Normal file
View File

@ -0,0 +1,61 @@
<RCC>
<qresource prefix="/" >
<file alias="images/viewer_toolbar/bookmark.png">../images/viewer_toolbar/bookmark_osx.png</file>
<file alias="images/viewer_toolbar/bookmark@2x.png">../images/viewer_toolbar/bookmark_osx@2x.png</file>
<file alias="images/viewer_toolbar/close.png">../images/viewer_toolbar/close_osx.png</file>
<file alias="images/viewer_toolbar/close@2x.png">../images/viewer_toolbar/close_osx@2x.png</file>
<file alias="images/viewer_toolbar/doubleMangaPage.png">../images/viewer_toolbar/doubleMangaPage_osx.png</file>
<file alias="images/viewer_toolbar/doubleMangaPage@2x.png">../images/viewer_toolbar/doubleMangaPage_osx@2x.png</file>
<file alias="images/viewer_toolbar/doublePage.png">../images/viewer_toolbar/doublePage_osx.png</file>
<file alias="images/viewer_toolbar/doublePage@2x.png">../images/viewer_toolbar/doublePage_osx@2x.png</file>
<file alias="images/viewer_toolbar/fitToPage.png">../images/viewer_toolbar/fitToPage_osx.png</file>
<file alias="images/viewer_toolbar/fitToPage@2x.png">../images/viewer_toolbar/fitToPage_osx@2x.png</file>
<file alias="images/viewer_toolbar/flow.png">../images/viewer_toolbar/flow_osx.png</file>
<file alias="images/viewer_toolbar/flow@2x.png">../images/viewer_toolbar/flow_osx@2x.png</file>
<file alias="images/viewer_toolbar/full.png">../images/viewer_toolbar/full_osx.png</file>
<file alias="images/viewer_toolbar/full@2x.png">../images/viewer_toolbar/full_osx@2x.png</file>
<file alias="images/viewer_toolbar/goto.png">../images/viewer_toolbar/goto_osx.png</file>
<file alias="images/viewer_toolbar/goto@2x.png">../images/viewer_toolbar/goto_osx@2x.png</file>
<file alias="images/viewer_toolbar/help.png">../images/viewer_toolbar/help_osx.png</file>
<file alias="images/viewer_toolbar/help@2x.png">../images/viewer_toolbar/help_osx@2x.png</file>
<file alias="images/viewer_toolbar/info.png">../images/viewer_toolbar/info_osx.png</file>
<file alias="images/viewer_toolbar/info@2x.png">../images/viewer_toolbar/info_osx@2x.png</file>
<file alias="images/viewer_toolbar/magnifyingGlass.png">../images/viewer_toolbar/magnifyingGlass_osx.png</file>
<file alias="images/viewer_toolbar/magnifyingGlass@2x.png">../images/viewer_toolbar/magnifyingGlass_osx@2x.png</file>
<file alias="images/viewer_toolbar/next.png">../images/viewer_toolbar/next_osx.png</file>
<file alias="images/viewer_toolbar/next@2x.png">../images/viewer_toolbar/next_osx@2x.png</file>
<file alias="images/viewer_toolbar/open.png">../images/viewer_toolbar/open_osx.png</file>
<file alias="images/viewer_toolbar/open@2x.png">../images/viewer_toolbar/open_osx@2x.png</file>
<file alias="images/viewer_toolbar/openFolder.png">../images/viewer_toolbar/openFolder_osx.png</file>
<file alias="images/viewer_toolbar/openFolder@2x.png">../images/viewer_toolbar/openFolder_osx@2x.png</file>
<file alias="images/viewer_toolbar/openNext.png">../images/viewer_toolbar/openNext_osx.png</file>
<file alias="images/viewer_toolbar/openNext@2x.png">../images/viewer_toolbar/openNext_osx@2x.png</file>
<file alias="images/viewer_toolbar/openPrevious.png">../images/viewer_toolbar/openPrevious_osx.png</file>
<file alias="images/viewer_toolbar/openPrevious@2x.png">../images/viewer_toolbar/openPrevious_osx@2x.png</file>
<file alias="images/viewer_toolbar/options.png">../images/viewer_toolbar/options_osx.png</file>
<file alias="images/viewer_toolbar/options@2x.png">../images/viewer_toolbar/options_osx@2x.png</file>
<file alias="images/viewer_toolbar/previous.png">../images/viewer_toolbar/previous_osx.png</file>
<file alias="images/viewer_toolbar/previous@2x.png">../images/viewer_toolbar/previous_osx@2x.png</file>
<file alias="images/viewer_toolbar/rotateL.png">../images/viewer_toolbar/rotateL_osx.png</file>
<file alias="images/viewer_toolbar/rotateL@2x.png">../images/viewer_toolbar/rotateL_osx@2x.png</file>
<file alias="images/viewer_toolbar/rotateR.png">../images/viewer_toolbar/rotateR_osx.png</file>
<file alias="images/viewer_toolbar/rotateR@2x.png">../images/viewer_toolbar/rotateR_osx@2x.png</file>
<file alias="images/viewer_toolbar/save.png">../images/viewer_toolbar/save_osx.png</file>
<file alias="images/viewer_toolbar/save@2x.png">../images/viewer_toolbar/save_osx@2x.png</file>
<file alias="images/viewer_toolbar/shortcuts.png">../images/viewer_toolbar/shortcuts_osx.png</file>
<file alias="images/viewer_toolbar/shortcuts@2x.png">../images/viewer_toolbar/shortcuts_osx@2x.png</file>
<file alias="images/viewer_toolbar/showBookmarks.png">../images/viewer_toolbar/showBookmarks_osx.png</file>
<file alias="images/viewer_toolbar/showBookmarks@2x.png">../images/viewer_toolbar/showBookmarks_osx@2x.png</file>
<file alias="images/viewer_toolbar/toHeight.png">../images/viewer_toolbar/toHeight_osx.png</file>
<file alias="images/viewer_toolbar/toHeight@2x.png">../images/viewer_toolbar/toHeight_osx@2x.png</file>
<file alias="images/viewer_toolbar/toWidth.png">../images/viewer_toolbar/toWidth_osx.png</file>
<file alias="images/viewer_toolbar/toWidth@2x.png">../images/viewer_toolbar/toWidth_osx@2x.png</file>
<file alias="images/viewer_toolbar/toWidthSlider.png">../images/viewer_toolbar/toWidthSlider_osx.png</file>
<file alias="images/viewer_toolbar/toWidthSlider@2x.png">../images/viewer_toolbar/toWidthSlider_osx@2x.png</file>
<file alias="images/viewer_toolbar/translator.png">../images/viewer_toolbar/translator_osx.png</file>
<file alias="images/viewer_toolbar/translator@2x.png">../images/viewer_toolbar/translator_osx@2x.png</file>
<file alias="images/viewer_toolbar/zoom.png">../images/viewer_toolbar/zoom_osx.png</file>
<file alias="images/viewer_toolbar/zoom@2x.png">../images/viewer_toolbar/zoom_osx@2x.png</file>
</qresource>
</RCC>

31
YACReader/yacreader_images_win.qrc Normal file
View File

@ -0,0 +1,31 @@
<RCC>
<qresource prefix="/" >
<file>../images/viewer_toolbar/bookmark.png</file>
<file>../images/viewer_toolbar/close.png</file>
<file>../images/viewer_toolbar/doublePage.png</file>
<file>../images/viewer_toolbar/doubleMangaPage.png</file>
<file>../images/viewer_toolbar/fitToPage.png</file>
<file>../images/viewer_toolbar/flow.png</file>
<file>../images/viewer_toolbar/full.png</file>
<file>../images/viewer_toolbar/goto.png</file>
<file>../images/viewer_toolbar/help.png</file>
<file>../images/viewer_toolbar/info.png</file>
<file>../images/viewer_toolbar/magnifyingGlass.png</file>
<file>../images/viewer_toolbar/next.png</file>
<file>../images/viewer_toolbar/open.png</file>
<file>../images/viewer_toolbar/openFolder.png</file>
<file>../images/viewer_toolbar/openNext.png</file>
<file>../images/viewer_toolbar/openPrevious.png</file>
<file>../images/viewer_toolbar/options.png</file>
<file>../images/viewer_toolbar/previous.png</file>
<file>../images/viewer_toolbar/rotateL.png</file>
<file>../images/viewer_toolbar/rotateR.png</file>
<file>../images/viewer_toolbar/save.png</file>
<file>../images/viewer_toolbar/shortcuts.png</file>
<file>../images/viewer_toolbar/showBookmarks.png</file>
<file>../images/viewer_toolbar/toHeight.png</file>
<file>../images/viewer_toolbar/toWidth.png</file>
<file>../images/viewer_toolbar/translator.png</file>
<file>../images/viewer_toolbar/zoom.png</file>
</qresource>
</RCC>

171
YACReader/yacreader_local_client.cpp Normal file
View File

@ -0,0 +1,171 @@
#include "yacreader_local_client.h"
#include "comic_db.h"
#include "yacreader_global.h"
#include <QLocalSocket>
#include "QsLog.h"
using namespace YACReader;
YACReaderLocalClient::YACReaderLocalClient(QObject *parent) :
QObject(parent)
{
localSocket = new QLocalSocket(this);
//connect(localSocket, SIGNAL(readyRead()), this, SLOT(readMessage()));
/*connect(socket, SIGNAL(error(QLocalSocket::LocalSocketError)),
this, SLOT(displayError(QLocalSocket::LocalSocketError)));*/
}
YACReaderLocalClient::~YACReaderLocalClient()
{
delete localSocket;
}
//información de comic recibida...
void YACReaderLocalClient::readMessage()
{
}
#include <QMessageBox>
bool YACReaderLocalClient::requestComicInfo(quint64 libraryId, ComicDB & comic, QList<ComicDB> & siblings)
{
localSocket->connectToServer(YACREADERLIBRARY_GUID);
if(localSocket->isOpen())
{
QByteArray block;
QDataStream out(&block, QIODevice::WriteOnly);
out.setVersion(QDataStream::Qt_4_8);
out << (quint32)0;
out << (quint8)YACReader::RequestComicInfo;
out << libraryId;
out << comic;
out.device()->seek(0);
out << (quint32)(block.size() - sizeof(quint32));
int written = 0;
int previousWritten = 0;
quint16 tries = 0;
while(written != block.size() && tries < 200)
{
written += localSocket->write(block);
localSocket->flush();
if(written == previousWritten) //no bytes were written
tries++;
previousWritten = written;
}
if(tries == 200)
{
localSocket->close();
QLOG_ERROR() << "Requesting Comic Info : unable to send request";
return false;
}
localSocket->waitForBytesWritten(2000);
//QByteArray data;
tries = 0;
int dataAvailable = 0;
QByteArray packageSize;
localSocket->waitForReadyRead(1000);
while(packageSize.size() < sizeof(quint32) && tries < 20)
{
packageSize.append(localSocket->read(sizeof(quint32) - packageSize.size()));
localSocket->waitForReadyRead(100);
if(dataAvailable == packageSize.size())
{
tries++; //TODO apply 'tries' fix
}
dataAvailable = packageSize.size();
}
if(tries == 20)
{
localSocket->close();
QLOG_ERROR() << "Requesting Comic Info : unable to read package size";
return false;
}
QDataStream sizeStream(packageSize);//localSocket->read(sizeof(quint32)));
sizeStream.setVersion(QDataStream::Qt_4_8);
quint32 totalSize = 0;
sizeStream >> totalSize;
QByteArray data;
tries = 0;
int dataRead = 0;
localSocket->waitForReadyRead(1000);
while((unsigned int)data.length() < totalSize && tries < 20 )
{
data.append(localSocket->readAll());
if((unsigned int)data.length() < totalSize)
localSocket->waitForReadyRead(100);
if(data.length() == dataRead)
tries++;
dataRead = data.length();
}
if(tries == 20)
{
localSocket->close();
QLOG_ERROR() << "Requesting Comic Info : unable to read data (" << data.length() << "," << totalSize << ")";
return false;
}
QDataStream dataStream(data);
dataStream >> comic;
dataStream >> siblings;
localSocket->close();
return true;
}
else
{
QLOG_ERROR() << "Requesting Comic Info : unable to connect to the server";
return false;
}
}
bool YACReaderLocalClient::sendComicInfo(quint64 libraryId, ComicDB & comic)
{
localSocket->connectToServer(YACREADERLIBRARY_GUID);
if(localSocket->isOpen())
{
//QLOG_INFO() << "Connection opened for sending ComicInfo";
QByteArray block;
QDataStream out(&block, QIODevice::WriteOnly);
out.setVersion(QDataStream::Qt_4_8);
out << (quint32)0;
out << (quint8)YACReader::SendComicInfo;
out << libraryId;
out << comic;
out.device()->seek(0);
out << (quint32)(block.size() - sizeof(quint32));
int written, previousWritten;
written = previousWritten = 0;
int tries = 0;
while(written != block.size() && tries < 100)
{
written += localSocket->write(block);
if(written == previousWritten)
tries++;
previousWritten = written;
}
localSocket->waitForBytesWritten(2000);
localSocket->close();
//QLOG_INFO() << QString("Sending Comic Info : writen data (%1,%2)").arg(written).arg(block.size());
if(tries == 100 && written != block.size())
{
emit finished();
QLOG_ERROR() << QString("Sending Comic Info : unable to write data (%1,%2)").arg(written).arg(block.size());
return false;
}
emit finished();
return true;
}
emit finished();
QLOG_ERROR() << "Sending Comic Info : unable to connect to the server";
return false;
}

27
YACReader/yacreader_local_client.h Normal file
View File

@ -0,0 +1,27 @@
#ifndef YACREADER_LOCAL_CLIENT_H
#define YACREADER_LOCAL_CLIENT_H
#include <QObject>
class QLocalSocket;
class ComicDB;
class YACReaderLocalClient : public QObject
{
Q_OBJECT
public:
explicit YACReaderLocalClient(QObject *parent = 0);
~YACReaderLocalClient();
signals:
void finished();
public slots:
void readMessage();
bool requestComicInfo(quint64 libraryId, ComicDB & comic,QList<ComicDB> & siblings);
bool sendComicInfo(quint64 libraryId, ComicDB & comic);
private:
QLocalSocket * localSocket;
};
#endif // YACREADER_LOCAL_CLIENT_H

1053
YACReader/yacreader_nl.ts Normal file
View File

File diff suppressed because it is too large Load Diff

1053
YACReader/yacreader_pt.ts Normal file
View File

File diff suppressed because it is too large Load Diff

1053
YACReader/yacreader_ru.ts Normal file
View File

File diff suppressed because it is too large Load Diff

1009
YACReader/yacreader_source.ts Normal file
View File

File diff suppressed because it is too large Load Diff

942
YACReader/yacreader_tr.ts Normal file
View File

@ -0,0 +1,942 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="tr_TR">
<context>
<name>ActionsShortcutsModel</name>
<message>
<source>None</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>BookmarksDialog</name>
<message>
<source>Close</source>
<translation>Kapat</translation>
</message>
<message>
<source>Loading...</source>
<translation>Yükleniyor...</translation>
</message>
<message>
<source>Click on any image to go to the bookmark</source>
<translation>Yer imine git</translation>
</message>
<message>
<source>Lastest Page</source>
<translation>Son Sayfa</translation>
</message>
</context>
<context>
<name>Configuration</name>
<message>
<source>There was a problem saving YACReader configuration. Please, check if you have enough permissions in the YACReader root folder.</source>
<translation type="vanished">Yeni ayarlar kaydedilirken bir problem çıktı. Lütfen YACReader dosyasını açın.</translation>
</message>
<message>
<source>Saving config file....</source>
<translation type="vanished">Config dosyası kaydediliyor...</translation>
</message>
</context>
<context>
<name>EditShortcutsDialog</name>
<message>
<source>Restore defaults</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>To change a shortcut, double click in the key combination and type the new keys.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Shortcuts settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Shortcut in use</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>The shortcut &quot;%1&quot; is already assigned to other function</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FileComic</name>
<message>
<source>File not found or not images in file</source>
<translation type="vanished">Dosya bulunamadı yada dosyada resim yok</translation>
</message>
<message>
<source>7z not found</source>
<translation>7z bulunamadı</translation>
</message>
<message>
<source>Comic not found</source>
<translation type="vanished">Çizgi roman bulunamadı</translation>
</message>
<message>
<source>Not found</source>
<translation type="vanished">Bulunamadı</translation>
</message>
<message>
<source>File error</source>
<translation type="vanished">Dosya hatası</translation>
</message>
<message>
<source>7z problem</source>
<translation type="vanished">7z Problemli</translation>
</message>
<message>
<source>7z reading</source>
<translation type="vanished">7z Okunuyor</translation>
</message>
<message>
<source>7z crashed.</source>
<translation type="vanished">7z Bozulmuş.</translation>
</message>
<message>
<source>problem reading from 7z</source>
<translation type="vanished">7z Okunurken Problem Oluştu</translation>
</message>
<message>
<source>7z crashed</source>
<translation type="vanished">7z Bozulması</translation>
</message>
<message>
<source>Unknown error 7z</source>
<translation type="vanished">Bilinmeyen 7z hatası</translation>
</message>
<message>
<source>7z wasn&apos;t found in your PATH.</source>
<translation type="vanished">7z Yolu Bulunamadı.</translation>
</message>
<message>
<source>CRC error on page (%1): some of the pages will not be displayed correctly</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Unknown error opening the file</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Format not supported</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>GoToDialog</name>
<message>
<source>Go To</source>
<translation>Git</translation>
</message>
<message>
<source>Go to...</source>
<translation>Git...</translation>
</message>
<message>
<source>Total pages : </source>
<translation>Toplam sayfa:</translation>
</message>
<message>
<source>Cancel</source>
<translation>Vazgeç</translation>
</message>
<message>
<source>Page : </source>
<translation>Sayfa :</translation>
</message>
</context>
<context>
<name>GoToFlowToolBar</name>
<message>
<source>Page : </source>
<translation>Sayfa : </translation>
</message>
</context>
<context>
<name>HelpAboutDialog</name>
<message>
<source>Help</source>
<translation>Yardım</translation>
</message>
<message>
<source>About</source>
<translation>Hakkında</translation>
</message>
</context>
<context>
<name>MainWindowViewer</name>
<message>
<source>C</source>
<translation type="vanished">C</translation>
</message>
<message>
<source>D</source>
<translation type="vanished">D</translation>
</message>
<message>
<source>G</source>
<translation type="vanished">G</translation>
</message>
<message>
<source>I</source>
<translation type="vanished">I</translation>
</message>
<message>
<source>L</source>
<translation type="vanished">L</translation>
</message>
<message>
<source>M</source>
<translation type="vanished">M</translation>
</message>
<message>
<source>O</source>
<translation type="vanished">O</translation>
</message>
<message>
<source>R</source>
<translation type="vanished">R</translation>
</message>
<message>
<source>Z</source>
<translation type="vanished">Z</translation>
</message>
<message>
<source>Help</source>
<translation>Yardım</translation>
</message>
<message>
<source>Save</source>
<translation>Kaydet</translation>
</message>
<message>
<source>&amp;File</source>
<translation>&amp;Dosya</translation>
</message>
<message>
<source>&amp;Next</source>
<translation>&amp;İleri</translation>
</message>
<message>
<source>&amp;Open</source>
<translation>&amp;Aç</translation>
</message>
<message>
<source>Close</source>
<translation>Kapat</translation>
</message>
<message>
<source>Open Comic</source>
<translation>Çizgi Romanı Aç</translation>
</message>
<message>
<source>Go To</source>
<translation>Git</translation>
</message>
<message>
<source>Open image folder</source>
<translation>Resim dosyasınıaç</translation>
</message>
<message>
<source>Set bookmark</source>
<translation>Yer imi yap</translation>
</message>
<message>
<source>page_%1.jpg</source>
<translation>sayfa_%1.jpg</translation>
</message>
<message>
<source>Switch to double page mode</source>
<translation>Çift sayfa moduna geç</translation>
</message>
<message>
<source>Save current page</source>
<translation>Geçerli sayfayı kaydet</translation>
</message>
<message>
<source>Double page mode</source>
<translation>Çift sayfa modu</translation>
</message>
<message>
<source>Switch Magnifying glass</source>
<translation>Büyüteç</translation>
</message>
<message>
<source>Open Folder</source>
<translation>Dosyayı Aç</translation>
</message>
<message>
<source>Ctrl+O</source>
<translation type="vanished">Ctrl+O</translation>
</message>
<message>
<source>Comic files</source>
<translation>Çizgi Roman Dosyaları</translation>
</message>
<message>
<source>Go to previous page</source>
<translation>Önceki sayfaya dön</translation>
</message>
<message>
<source>Open a comic</source>
<translation>Çizgi romanı aç</translation>
</message>
<message>
<source>Image files (*.jpg)</source>
<translation>Resim dosyaları (*.jpg)</translation>
</message>
<message>
<source>Next Comic</source>
<translation>Sırada ki çizgi roman</translation>
</message>
<message>
<source>Saving error log file....</source>
<translation type="vanished">Hata dosyasını kaydet...</translation>
</message>
<message>
<source>Fit Width</source>
<translation>Uygun Genişlik</translation>
</message>
<message>
<source>Options</source>
<translation>Ayarlar</translation>
</message>
<message>
<source>Show Info</source>
<translation>Bilgiyi göster</translation>
</message>
<message>
<source>Open folder</source>
<translation>Dosyayı aç</translation>
</message>
<message>
<source>Go to page ...</source>
<translation>Sayfata git...</translation>
</message>
<message>
<source>Fit image to width</source>
<translation>Görüntüyü sığdır</translation>
</message>
<message>
<source>&amp;Previous</source>
<translation>&amp;Geri</translation>
</message>
<message>
<source>Go to next page</source>
<translation>Sonra ki sayfaya geç</translation>
</message>
<message>
<source>Show keyboard shortcuts</source>
<translation>Kılavye kısayollarını göster</translation>
</message>
<message>
<source>Open next comic</source>
<translation>Sıradaki çizgi romanı aç</translation>
</message>
<message>
<source>There is a new version available</source>
<translation>Yeni versiyon mevcut</translation>
</message>
<message>
<source>Show bookmarks</source>
<translation>Yer imlerini göster</translation>
</message>
<message>
<source>Open previous comic</source>
<translation>Önceki çizgi romanı aç</translation>
</message>
<message>
<source>Rotate image to the left</source>
<translation>Sayfayı sola yatır</translation>
</message>
<message>
<source>Fit image to height</source>
<translation>Uygun yüksekliğe getir</translation>
</message>
<message>
<source>Show the bookmarks of the current comic</source>
<translation>Bu çizgi romanın yer imlerini göster</translation>
</message>
<message>
<source>Show Dictionary</source>
<translation>Sözlüğü göster</translation>
</message>
<message>
<source>YACReader options</source>
<translation>YACReader ayarları</translation>
</message>
<message>
<source>Help, About YACReader</source>
<translation>YACReader hakkında yardım ve bilgi</translation>
</message>
<message>
<source>Show go to flow</source>
<translation>Akışı göster</translation>
</message>
<message>
<source>Previous Comic</source>
<translation>Önce ki çizgi roman</translation>
</message>
<message>
<source>Show full size</source>
<translation>Tam erken</translation>
</message>
<message>
<source>Magnifying glass</source>
<translation>Büyüteç</translation>
</message>
<message>
<source>Set a bookmark on the current page</source>
<translation>Sayfayı yer imi olarak ayarla</translation>
</message>
<message>
<source>Do you want to download the new version?</source>
<translation>Yeni versiyonu indirmek ister misin ?</translation>
</message>
<message>
<source>There was a problem saving YACReader error log file. Please, check if you have enough permissions in the YACReader root folder.</source>
<translation type="vanished">Kaydederken bir problem çıktı YACReader hata kayıt dosyası. Lütfen YACReader root dosyasını ziyaret edin.</translation>
</message>
<message>
<source>Rotate image to the right</source>
<translation>Sayfayı sağa yator</translation>
</message>
<message>
<source>Always on top</source>
<translation>Her zaman üstte</translation>
</message>
<message>
<source>Remind me in 14 days</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Not now</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Fit Height</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>File</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Clear</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Fit to page</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Reset zoom</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Show zoom slider</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Zoom+</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Zoom-</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Double page manga mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Reverse reading order in double page mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Edit shortcuts</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Open recent</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Comics</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Toggle fullscreen mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Hide/show toolbar</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>General</source>
<translation type="unfinished">Genel</translation>
</message>
<message>
<source>Size up magnifying glass</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Size down magnifying glass</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Zoom in magnifying glass</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Zoom out magnifying glass</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Magnifiying glass</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Toggle between fit to width and fit to height</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Page adjustement</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Autoscroll down</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Autoscroll up</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Move down</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Move up</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Move left</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Move right</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Go to the first page</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Go to the last page</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Reading</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Open latest comic</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Open the latest comic opened in the previous reading session</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Clear open recent list</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Edit</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>View</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Go</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Window</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Autoscroll forward, horizontal first</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Autoscroll backward, horizontal first</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Autoscroll forward, vertical first</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Autoscroll backward, vertical first</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>OptionsDialog</name>
<message>
<source>Gamma</source>
<translation>Gama</translation>
</message>
<message>
<source>Reset</source>
<translation>Yeniden başlat</translation>
</message>
<message>
<source>My comics path</source>
<translation>Çizgi Romanlarım</translation>
</message>
<message>
<source>Image adjustment</source>
<translation>Resim ayarları</translation>
</message>
<message>
<source>Page width stretch</source>
<translation type="vanished">Sayfayı uzat</translation>
</message>
<message>
<source>&quot;Go to flow&quot; size</source>
<translation>Akış görünümüne git</translation>
</message>
<message>
<source>Choose</source>
<translation>Seç</translation>
</message>
<message>
<source>Image options</source>
<translation>Sayfa ayarları</translation>
</message>
<message>
<source>Contrast</source>
<translation>Kontrast</translation>
</message>
<message>
<source>Options</source>
<translation>Ayarlar</translation>
</message>
<message>
<source>Comics directory</source>
<translation>Çizgi roman konumu</translation>
</message>
<message>
<source>Background color</source>
<translation>Arka plan rengi</translation>
</message>
<message>
<source>Page Flow</source>
<translation>Sayfa akışı</translation>
</message>
<message>
<source>General</source>
<translation>Genel</translation>
</message>
<message>
<source>Brightness</source>
<translation>Parlaklık</translation>
</message>
<message>
<source>Restart is needed</source>
<translation>Yeniden başlatılmalı</translation>
</message>
<message>
<source>Quick Navigation Mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Disable mouse over activation</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QObject</name>
<message>
<source>7z lib not found</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>unable to load 7z lib from ./utils</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ShortcutsDialog</name>
<message>
<source>Close</source>
<translation>Kapat</translation>
</message>
<message>
<source>YACReader keyboard shortcuts</source>
<translation>YACReader klavye kısayolları</translation>
</message>
<message>
<source>Keyboard Shortcuts</source>
<translation>Kılavye Kısayolları</translation>
</message>
</context>
<context>
<name>Viewer</name>
<message>
<source>Press &apos;O&apos; to open comic.</source>
<translation>&apos;O&apos;ya basarak aç.</translation>
</message>
<message>
<source>Cover!</source>
<translation>Kapak!</translation>
</message>
<message>
<source>Comic not found</source>
<translation>Çizgi roman bulunamadı</translation>
</message>
<message>
<source>Not found</source>
<translation>Bulunamadı</translation>
</message>
<message>
<source>Last page!</source>
<translation>Son sayfa!</translation>
</message>
<message>
<source>Loading...please wait!</source>
<translation>Yükleniyor... lütfen bekleyin!</translation>
</message>
<message>
<source>Error opening comic</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>CRC Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Page not available!</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>YACReaderDeletingProgress</name>
<message>
<source>cancel</source>
<translation type="vanished">vazgeç</translation>
</message>
<message>
<source>Please wait, deleting in progress...</source>
<translation type="vanished">Lütfen bekle silme işlemi gerçekleştiriliyor...</translation>
</message>
</context>
<context>
<name>YACReaderFieldEdit</name>
<message>
<source>Restore to default</source>
<translation>Varsayılana ayarla</translation>
</message>
<message>
<source>Click to overwrite</source>
<translation>Üzerine yazmak için tıkla</translation>
</message>
</context>
<context>
<name>YACReaderFieldPlainTextEdit</name>
<message>
<source>Restore to default</source>
<translation>Varsayılana ayarla</translation>
</message>
<message>
<source>Click to overwrite</source>
<translation>Üstüne yazmak için tıkla</translation>
</message>
</context>
<context>
<name>YACReaderFlowConfigWidget</name>
<message>
<source>CoverFlow look</source>
<translation>Kapak akışı görünümü</translation>
</message>
<message>
<source>How to show covers:</source>
<translation>Kapaklar nasıl gözüksün:</translation>
</message>
<message>
<source>Stripe look</source>
<translation>Şerit görünüm</translation>
</message>
<message>
<source>Overlapped Stripe look</source>
<translation>Çakışan şerit görünüm</translation>
</message>
</context>
<context>
<name>YACReaderGLFlowConfigWidget</name>
<message>
<source>Zoom</source>
<translation>Yakınlaş</translation>
</message>
<message>
<source>Light</source>
<translation>Işık</translation>
</message>
<message>
<source>Show advanced settings</source>
<translation>Daha fazla ayar göster</translation>
</message>
<message>
<source>Roulette look</source>
<translation>Rulet görünüm</translation>
</message>
<message>
<source>Cover Angle</source>
<translation>Kapak Açısı</translation>
</message>
<message>
<source>Stripe look</source>
<translation>Strip görünüm</translation>
</message>
<message>
<source>Position</source>
<translation>Pozisyon</translation>
</message>
<message>
<source>Z offset</source>
<translation>Z dengesi</translation>
</message>
<message>
<source>Y offset</source>
<translation>Y dengesi</translation>
</message>
<message>
<source>Central gap</source>
<translation>Boş merkaz</translation>
</message>
<message>
<source>Presets:</source>
<translation>Hazırlayan:</translation>
</message>
<message>
<source>Overlapped Stripe look</source>
<translation>Çakışan şerit görünüm</translation>
</message>
<message>
<source>Modern look</source>
<translation>Modern görünüm</translation>
</message>
<message>
<source>View angle</source>
<translation>Bakış açısı</translation>
</message>
<message>
<source>Max angle</source>
<translation>Maksimum açı</translation>
</message>
<message>
<source>Custom:</source>
<translation>Kişisel:</translation>
</message>
<message>
<source>Classic look</source>
<translation>Klasik görünüm</translation>
</message>
<message>
<source>Cover gap</source>
<translation>Kapak </translation>
</message>
<message>
<source>High Performance</source>
<translation>Yüksek performans</translation>
</message>
<message>
<source>Performance:</source>
<translation>Performans:</translation>
</message>
<message>
<source>Use VSync (improve the image quality in fullscreen mode, worse performance)</source>
<translation>VSync kullan</translation>
</message>
<message>
<source>Visibility</source>
<translation>Görünülebilirlik</translation>
</message>
<message>
<source>Low Performance</source>
<translation>Düşük Performans</translation>
</message>
</context>
<context>
<name>YACReaderOptionsDialog</name>
<message>
<source>Save</source>
<translation>Kaydet</translation>
</message>
<message>
<source>Use hardware acceleration (restart needed)</source>
<translation>Yüksek donanımlı kullan (yeniden başlatmak gerekli)</translation>
</message>
<message>
<source>Cancel</source>
<translation>Vazgeç</translation>
</message>
<message>
<source>Edit shortcuts</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Shortcuts</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>YACReaderSideBar</name>
<message>
<source>Search folders and comics</source>
<translation type="vanished">Dosyaları ve çizgi romanları ara</translation>
</message>
<message>
<source>LIBRARIES</source>
<translation type="vanished">KÜTÜPHANELER</translation>
</message>
<message>
<source>FOLDERS</source>
<translation type="vanished">DOSYALAR</translation>
</message>
</context>
<context>
<name>YACReaderSlider</name>
<message>
<source>Reset</source>
<translation type="unfinished">Yeniden başlat</translation>
</message>
</context>
<context>
<name>YACReaderTranslator</name>
<message>
<source>YACReader translator</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Translation</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>clear</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Service not available</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>

48
YACReaderLibrary.1 Normal file
View File

@ -0,0 +1,48 @@
.\" Manpage for YACReaderLibrary.
.\" Contact yoann.gauthier9@gmail.com to correct errors or typos.
.TH man 1 "28 September 2014" "2.0" "YACReaderLibrary man page"
.SH NAME
YACReaderLibrary \- launch YACReaderLibrary application.
.SH SYNOPSIS
YACReaderLibrary
.br
YACReaderLibrary [\fB\-h\fR | \fB\-\-help\fR]
.br
YACReaderLibrary [\fB\-v\fR | \fB\-\-version\fR]
.SH DESCRIPTION
YACReaderLibrary an application for browsing and managing your comic collections with various smooth transition effects.
.SH OPTIONS
.TP
Without options
Start YACReaderLibrary.
.TP
.BR \-h, \-\- help
Display help text and exit.
.TP
.BR \-v, \-\- version
Display version information and exit.
.SH FEATURES
- Create, manage and browse your comics collections using beautiful, customizable and smooth "comic flow" transitions.
.TP
- Comic Vine support.
.TP
- Easily organization of your comics in libraries.
.TP
- Find your comics quickly using the built-in search engine.
.TP
- Open your comics with YACReader from YACReaderLibrary.
.TP
- Enjoy your comics covers with the fullscreen mode.
.TP
- Mark your comics as read/unread and track your reading progress.
.SH CONTACTS
To report bug or contact developpers, send a mail to :
.RS 3
.TP
\fBinfo@yacreader.com\fR : for general information or suggestions about YACReader.
.TP
\fBsupport@yacreader.com\fR : for problems with YACReader or bugs detected.
.RE
.SH AUTHOR
Luis Ángel San Martín Rodríguez (luisangelsm@gmail.com)

13
YACReaderLibrary.desktop Normal file
View File

@ -0,0 +1,13 @@
[Desktop Entry]
Name=YACReader Library
GenericName=Yet Another Comic Reader - Library
Comment=A comic library management application with server mode.
Exec=YACReaderLibrary %f
Icon=YACReaderLibrary
Terminal=false
Type=Application
StartupNotify=true
Categories=Graphics;Viewer;
MimeType=
Keywords=comic;library;server;
X-Desktop-File-Install-Version=0.22

314
YACReaderLibrary.svg Normal file
View File

@ -0,0 +1,314 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
<style type="text/css">
.st0{clip-path:url(#SVGID_2_);fill:url(#SVGID_3_);}
.st1{fill:#FEFEFE;}
</style>
<g>
<defs>
<path id="SVGID_5_" d="M462,512H50c-27.6142368,0-50-22.3857727-50-50V50C0,22.3857632,22.3857632,0,50,0h412
c27.6142273,0,50,22.3857632,50,50v412C512,489.6142273,489.6142273,512,462,512z"/>
</defs>
<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="0" y1="256" x2="512" y2="256">
<stop offset="0" style="stop-color:#40AEF7"/>
<stop offset="1" style="stop-color:#057DF5"/>
</linearGradient>
<use xlink:href="#SVGID_5_" style="overflow:visible;fill:url(#SVGID_1_);"/>
<clipPath id="SVGID_2_">
<use xlink:href="#SVGID_5_" style="overflow:visible;"/>
</clipPath>
<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="256" y1="0" x2="256" y2="512">
<stop offset="0" style="stop-color:#3DA0FC"/>
<stop offset="1" style="stop-color:#366492"/>
</linearGradient>
<rect class="st0" width="512" height="512"/>
</g>
<g>
<image style="overflow:visible;opacity:0.7;" width="388" height="377" xlink:href="data:image/png;base64,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
6P8JMACucHXw+vhQRgAAAABJRU5ErkJggg==" transform="matrix(1 0 0 1 62 85)">
</image>
<g>
<path class="st1" d="M439.2805786,186.093811c-7.0472412-29.8051147-22.3309326-54.7461548-48.8744507-71.4110718
c-27.4782715-17.25177-58.0531616-24.1377563-90.0792236-25.3665161
c-22.4115601-0.8599243-44.5668945,2.0182495-66.5804443,5.8222656
c-25.1137695,4.3397827-49.6187134,11.0008545-72.7399292,21.8890991
c-19.480835,9.1738892-37.0109863,21.192688-53.020813,35.8248291
c-14.2028809,12.9807739-24.5753784,28.0153198-30.9389648,45.9541626
c-10.3276367,29.1135254-11.0252075,59.1328125-5.6420898,89.024353
c5.4616089,30.3273315,22.7755737,52.993103,50.579834,66.7850342c14.9343872,7.40802,31.5568237,8.7140503,47.8207397,10.5712891
c20.7324219,2.3673706,41.5535278,3.9608154,62.3410645,5.8366699c1.9974976,0.1802368,3.7282104,0.3190308,4.5340576,2.6282349
c1.8388672,5.2693481,3.3258057,10.5143433,2.7539063,16.2418823
c-1.4500732,14.5206299-9.3815308,26.1367798-17.0232544,37.7714233
c-5.7234497,8.7139282-12.6152344,16.611145-20.5682373,24.5336304c9.3279419,2.1087036,17.1699219,0.967041,24.7111206-2.4294434
c14.005249-6.3078613,27.4047241-13.6868896,39.7042236-22.9464722
c19.5841675-14.7437134,36.1634521-32.4883423,51.2288818-51.7009277
c2.0390015-2.6003418,4.2141113-3.7982788,7.5055542-4.3917236
c50.5076294-9.1068115,85.7607422-38.1300659,106.0571899-84.5401001
C445.0603638,254.1536865,447.3317261,220.1444092,439.2805786,186.093811z M180.5,290c-5.2467041,0-9.5-4.2532959-9.5-9.5
s4.2532959-9.5,9.5-9.5s9.5,4.2532959,9.5,9.5S185.7467041,290,180.5,290z M180.5,245c-5.2467041,0-9.5-4.2532959-9.5-9.5
s4.2532959-9.5,9.5-9.5s9.5,4.2532959,9.5,9.5S185.7467041,245,180.5,245z M180.5,200c-5.2467041,0-9.5-4.2532959-9.5-9.5
s4.2532959-9.5,9.5-9.5s9.5,4.2532959,9.5,9.5S185.7467041,200,180.5,200z M338.5,290h-129c-5.2467041,0-9.5-4.2532959-9.5-9.5
s4.2532959-9.5,9.5-9.5h129c5.2467041,0,9.5,4.2532959,9.5,9.5S343.7467041,290,338.5,290z M338.5,245h-129
c-5.2467041,0-9.5-4.2532959-9.5-9.5s4.2532959-9.5,9.5-9.5h129c5.2467041,0,9.5,4.2532959,9.5,9.5S343.7467041,245,338.5,245z
M338.5,200h-129c-5.2467041,0-9.5-4.2532959-9.5-9.5s4.2532959-9.5,9.5-9.5h129c5.2467041,0,9.5,4.2532959,9.5,9.5
S343.7467041,200,338.5,200z"/>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 23 KiB

BIN
YACReaderLibrary/YACReaderLibrary.icns Normal file
View File

Binary file not shown.

325
YACReaderLibrary/YACReaderLibrary.pro Normal file
View File

@ -0,0 +1,325 @@
TEMPLATE = app
TARGET = YACReaderLibrary
QMAKE_TARGET_BUNDLE_PREFIX = "com.yacreader"
DEPENDPATH += .
INCLUDEPATH += . \
../common \
./server \
./db \
../custom_widgets \
./comic_vine \
./comic_vine/model
DEFINES += SERVER_RELEASE NOMINMAX YACREADER_LIBRARY
QMAKE_MAC_SDK = macosx10.12
# load default build flags
include (../config.pri)
include (../dependencies/pdf_backend.pri)
unix:haiku {
DEFINES += _BSD_SOURCE
LIBS += -lnetwork -lbsd
}
CONFIG(legacy_gl_widget) {
INCLUDEPATH += ../common/gl_legacy \
} else {
INCLUDEPATH += ../common/gl \
}
# there are two builds for Windows, Desktop OpenGL based and ANGLE OpenGL ES based
win32 {
CONFIG(force_angle) {
message("using ANGLE")
LIBS += -loleaut32 -lole32 -lshell32 -lopengl32 -lglu32 -luser32
# linking extra libs are necesary for a successful compilation, a better approach should be
# to remove any OpenGL (desktop) dependencies
# the OpenGL stuff should be migrated to OpenGL ES
DEFINES += FORCE_ANGLE
} else {
LIBS += -loleaut32 -lole32 -lshell32 -lopengl32 -lglu32 -luser32
}
QMAKE_CXXFLAGS_RELEASE += /MP /Ob2 /Oi /Ot /GT /GL
QMAKE_LFLAGS_RELEASE += /LTCG
CONFIG -= embed_manifest_exe
}
CONFIG(force_angle) {
contains(QMAKE_TARGET.arch, x86_64) {
Release:DESTDIR = ../release64_angle
Debug:DESTDIR = ../debug64_angle
} else {
Release:DESTDIR = ../release_angle
Debug:DESTDIR = ../debug_angle
}
} else {
contains(QMAKE_TARGET.arch, x86_64) {
Release:DESTDIR = ../release64
Debug:DESTDIR = ../debug64
} else {
Release:DESTDIR = ../release
Debug:DESTDIR = ../debug
}
}
unix:!macx:!CONFIG(no_opengl) {
LIBS += -lGLU
}
macx {
LIBS += -framework Foundation -framework ApplicationServices -framework AppKit
CONFIG += objective_c
QT += macextras gui-private
}
unix:!macx {
CONFIG += c++11
}
#CONFIG += release
CONFIG -= flat
QT += sql network widgets script
!CONFIG(no_opengl) {
QT += opengl
}
# Input
HEADERS += comic_flow.h \
create_library_dialog.h \
library_creator.h \
library_window.h \
add_library_dialog.h \
rename_library_dialog.h \
properties_dialog.h \
options_dialog.h \
export_library_dialog.h \
import_library_dialog.h \
package_manager.h \
bundle_creator.h \
export_comics_info_dialog.h \
import_comics_info_dialog.h \
server_config_dialog.h \
comic_flow_widget.h \
db_helper.h \
./db/data_base_management.h \
./db/folder_item.h \
./db/folder_model.h \
./db/comic_model.h \
./db/comic_item.h \
../common/comic_db.h \
../common/folder.h \
../common/library_item.h \
../common/comic.h \
../common/bookmarks.h \
../common/pictureflow.h \
../common/custom_widgets.h \
../common/qnaturalsorting.h \
../common/yacreader_global.h \
../common/yacreader_global_gui.h \
../common/onstart_flow_selection_dialog.h \
../common/pdf_comic.h \
no_libraries_widget.h \
import_widget.h \
yacreader_local_server.h \
yacreader_main_toolbar.h \
comics_remover.h \
../common/http_worker.h \
yacreader_libraries.h \
../common/exit_check.h \
comics_view.h \
classic_comics_view.h \
empty_folder_widget.h \
no_search_results_widget.h \
comic_files_manager.h \
db/reading_list_model.h \
db/reading_list_item.h \
yacreader_folders_view.h \
yacreader_reading_lists_view.h \
add_label_dialog.h \
yacreader_history_controller.h \
yacreader_navigation_controller.h \
empty_label_widget.h \
empty_container_info.h \
empty_special_list.h \
empty_reading_list_widget.h \
../common/scroll_management.h \
../common/opengl_checker.h \
yacreader_comics_views_manager.h \
info_comics_view.h \
yacreader_comics_selection_helper.h \
yacreader_comic_info_helper.h
!CONFIG(no_opengl) {
CONFIG(legacy_gl_widget) {
message("using legacy YACReaderFlowGL (QGLWidget) header")
HEADERS += ../common/gl_legacy/yacreader_flow_gl.h
} else {
HEADERS += ../common/gl/yacreader_flow_gl.h
}
}
SOURCES += comic_flow.cpp \
create_library_dialog.cpp \
library_creator.cpp \
library_window.cpp \
main.cpp \
add_library_dialog.cpp \
rename_library_dialog.cpp \
properties_dialog.cpp \
options_dialog.cpp \
export_library_dialog.cpp \
import_library_dialog.cpp \
package_manager.cpp \
bundle_creator.cpp \
export_comics_info_dialog.cpp \
import_comics_info_dialog.cpp \
server_config_dialog.cpp \
comic_flow_widget.cpp \
db_helper.cpp \
./db/data_base_management.cpp \
./db/folder_item.cpp \
./db/folder_model.cpp \
./db/comic_model.cpp \
./db/comic_item.cpp \
../common/comic_db.cpp \
../common/folder.cpp \
../common/library_item.cpp \
../common/comic.cpp \
../common/bookmarks.cpp \
../common/pictureflow.cpp \
../common/custom_widgets.cpp \
../common/qnaturalsorting.cpp \
../common/onstart_flow_selection_dialog.cpp \
no_libraries_widget.cpp \
import_widget.cpp \
yacreader_local_server.cpp \
yacreader_main_toolbar.cpp \
comics_remover.cpp \
../common/http_worker.cpp \
../common/yacreader_global.cpp \
../common/yacreader_global_gui.cpp \
yacreader_libraries.cpp \
../common/exit_check.cpp \
comics_view.cpp \
classic_comics_view.cpp \
empty_folder_widget.cpp \
no_search_results_widget.cpp \
comic_files_manager.cpp \
db/reading_list_model.cpp \
db/reading_list_item.cpp \
yacreader_folders_view.cpp \
yacreader_reading_lists_view.cpp \
add_label_dialog.cpp \
yacreader_history_controller.cpp \
yacreader_navigation_controller.cpp \
empty_label_widget.cpp \
empty_container_info.cpp \
empty_special_list.cpp \
empty_reading_list_widget.cpp \
../common/scroll_management.cpp \
../common/opengl_checker.cpp \
yacreader_comics_views_manager.cpp \
info_comics_view.cpp \
yacreader_comics_selection_helper.cpp \
yacreader_comic_info_helper.cpp
!CONFIG(no_opengl) {
CONFIG(legacy_gl_widget) {
message("using legacy YACReaderFlowGL (QGLWidget) source code")
SOURCES += ../common/gl_legacy/yacreader_flow_gl.cpp
} else {
SOURCES += ../common/gl/yacreader_flow_gl.cpp
}
}
include(./server/server.pri)
include(../custom_widgets/custom_widgets_yacreaderlibrary.pri)
CONFIG(7zip){
include(../compressed_archive/wrapper.pri)
} else:CONFIG(unarr) {
include(../compressed_archive/unarr/unarr-wrapper.pri)
} else {
error(No compression backend specified. Did you mess with the build system?)
}
include(./comic_vine/comic_vine.pri)
include(../QsLog/QsLog.pri)
include(../shortcuts_management/shortcuts_management.pri)
RESOURCES += images.qrc files.qrc
win32:RESOURCES += images_win.qrc
unix:!macx:RESOURCES += images_win.qrc
macx:RESOURCES += images_osx.qrc
RC_FILE = icon.rc
macx {
ICON = YACReaderLibrary.icns
}
TRANSLATIONS = yacreaderlibrary_es.ts \
yacreaderlibrary_ru.ts \
yacreaderlibrary_pt.ts \
yacreaderlibrary_fr.ts \
yacreaderlibrary_nl.ts \
yacreaderlibrary_tr.ts \
yacreaderlibrary_de.ts \
yacreaderlibrary_source.ts
#QML/GridView
QT += quick qml
HEADERS += grid_comics_view.h \
comics_view_transition.h
SOURCES += grid_comics_view.cpp \
comics_view_transition.cpp
RESOURCES += qml.qrc
win32:RESOURCES += qml_win.qrc
unix:!macx:RESOURCES += qml_win.qrc
macx:RESOURCES += qml_osx.qrc
unix:!macx {
#set install prefix if it's empty
isEmpty(PREFIX) {
PREFIX = /usr
}
BINDIR = $$PREFIX/bin
LIBDIR = $$PREFIX/lib
DATADIR = $$PREFIX/share
DEFINES += "LIBDIR=\\\"$$LIBDIR\\\"" "DATADIR=\\\"$$DATADIR\\\"" "BINDIR=\\\"$$BINDIR\\\""
#MAKE INSTALL
INSTALLS += bin icon desktop server translation manpage
bin.path = $$BINDIR
isEmpty(DESTDIR) {
bin.files = YACReaderLibrary
} else {
bin.files = $$DESTDIR/YACReaderLibrary
}
server.path = $$DATADIR/yacreader
server.files = ../release/server
icon.path = $$DATADIR/icons/hicolor/scalable/apps
icon.files = ../YACReaderLibrary.svg
desktop.path = $$DATADIR/applications
desktop.files = ../YACReaderLibrary.desktop
translation.path = $$DATADIR/yacreader/languages
translation.files = ../release/languages/yacreaderlibrary_*
manpage.path = $$DATADIR/man/man1
manpage.files = ../YACReaderLibrary.1
}

84
YACReaderLibrary/add_label_dialog.cpp Normal file
View File

@ -0,0 +1,84 @@
#include "add_label_dialog.h"
AddLabelDialog::AddLabelDialog(QWidget *parent) :
QDialog(parent)
{
QVBoxLayout * layout = new QVBoxLayout;
layout->addWidget(new QLabel(tr("Label name:")));
layout->addWidget(edit = new QLineEdit());
layout->addWidget(new QLabel(tr("Choose a color:")));
layout->addWidget(list = new QListWidget() );
list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_red.png"), tr("red")));
list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_orange.png"), tr("orange")));
list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_yellow.png"), tr("yellow")));
list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_green.png"), tr("green")));
list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_cyan.png"), tr("cyan")));
list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_blue.png"), tr("blue")));
list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_violet.png"), tr("violet")));
list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_purple.png"), tr("purple")));
list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_pink.png"), tr("pink")));
list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_white.png"), tr("white")));
list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_light.png"), tr("light")));
list->addItem(new QListWidgetItem(QIcon(":/images/lists/label_dark.png"), tr("dark")));
QColor backgroundColor = this->palette().background().color();
list->setStyleSheet(QString("QListWidget {border : none; background-color: rgb(%1,%2,%3);}").arg(backgroundColor.red()).arg(backgroundColor.green()).arg(backgroundColor.blue()));
list->setMinimumHeight(225);
setModal(true);
setMinimumHeight(340);
//buttons
acceptButton = new QPushButton(tr("accept"),this);
cancelButton = new QPushButton(tr("cancel"),this);
QHBoxLayout * buttons = new QHBoxLayout;
buttons->addStretch();
buttons->addWidget(acceptButton);
buttons->addWidget(cancelButton);
layout->addStretch();
layout->addLayout(buttons);
setLayout(layout);
//connections
connect(edit,SIGNAL(textChanged(QString)),this,SLOT(validateName(QString)));
connect(cancelButton,SIGNAL(clicked()),this,SLOT(close()));
connect(acceptButton,SIGNAL(clicked()),this,SLOT(accept()));
}
YACReader::LabelColors AddLabelDialog::selectedColor()
{
return YACReader::LabelColors(list->currentRow()+1);
}
QString AddLabelDialog::name()
{
return edit->text();
}
int AddLabelDialog::exec()
{
edit->clear();
list->clearSelection();
acceptButton->setDisabled(true);
list->setCurrentRow(0);
return QDialog::exec();
}
void AddLabelDialog::validateName(const QString &name)
{
if(name.isEmpty())
acceptButton->setDisabled(true);
else
acceptButton->setEnabled(true);
}

31
YACReaderLibrary/add_label_dialog.h Normal file
View File

@ -0,0 +1,31 @@
#ifndef ADD_LABEL_DIALOG_H
#define ADD_LABEL_DIALOG_H
#include <QtWidgets>
#include "yacreader_global.h"
class AddLabelDialog : public QDialog
{
Q_OBJECT
public:
explicit AddLabelDialog(QWidget *parent = 0);
YACReader::LabelColors selectedColor();
QString name();
signals:
public slots:
int exec();
protected slots:
void validateName(const QString & name);
protected:
QLineEdit * edit;
QListWidget * list;
QPushButton * acceptButton;
QPushButton * cancelButton;
};
#endif // ADD_LABEL_DIALOG_H

124
YACReaderLibrary/add_library_dialog.cpp Normal file
View File

@ -0,0 +1,124 @@
#include "add_library_dialog.h"
#include <QHBoxLayout>
#include <QVBoxLayout>
#include <QFileDialog>
#include <QGridLayout>
AddLibraryDialog::AddLibraryDialog(QWidget * parent)
:QDialog(parent)
{
setupUI();
}
void AddLibraryDialog::setupUI()
{
textLabel = new QLabel(tr("Comics folder : "));
path = new QLineEdit;
textLabel->setBuddy(path);
connect(path,SIGNAL(textChanged(QString)),this,SLOT(pathSetted(QString)));
nameLabel = new QLabel(tr("Library Name : "));
nameEdit = new QLineEdit;
nameLabel->setBuddy(nameEdit);
connect(nameEdit,SIGNAL(textChanged(QString)),this,SLOT(nameSetted(QString)));
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/find_folder.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()));
}
void AddLibraryDialog::nameSetted(const QString & text)
{
if(!text.isEmpty())
{
if(!path->text().isEmpty())
{
QFileInfo fi(path->text());
if(fi.isDir())
accept->setEnabled(true);
else
accept->setEnabled(false);
}
}
else
accept->setEnabled(false);
}
void AddLibraryDialog::pathSetted(const QString & text)
{
QFileInfo fi(text);
if(fi.isDir())
{
if(!nameEdit->text().isEmpty())
accept->setEnabled(true);
}
else
accept->setEnabled(false);
}
void AddLibraryDialog::findPath()
{
QString s = QFileDialog::getExistingDirectory(0,"Comics directory",".");
if(!s.isEmpty())
{
path->setText(s);
if(!nameEdit->text().isEmpty())
accept->setEnabled(true);
}
else
accept->setEnabled(false);
}
void AddLibraryDialog::close()
{
path->clear();
nameEdit->clear();
accept->setEnabled(false);
QDialog::close();
}

35
YACReaderLibrary/add_library_dialog.h Normal file
View File

@ -0,0 +1,35 @@
#ifndef __ADD_LIBRARY_DIALOG_H
#define __ADD_LIBRARY_DIALOG_H
#include <QDialog>
#include <QLabel>
#include <QLineEdit>
#include <QPushButton>
#include <QThread>
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();
void nameSetted(const QString & text);
void pathSetted(const QString & text);
signals:
void addLibrary(QString target, QString name);
};
#endif

13
YACReaderLibrary/bundle_creator.cpp Normal file
View File

@ -0,0 +1,13 @@
#include "bundle_creator.h"
BundleCreator::BundleCreator(void)
:QObject()
{
}
BundleCreator::~BundleCreator(void)
{
}

14
YACReaderLibrary/bundle_creator.h Normal file
View File

@ -0,0 +1,14 @@
#ifndef __BUNDLE_CREATOR_H
#define __BUNDLE_CREATOR_H
#include <QtCore>
class BundleCreator : public QObject
{
Q_OBJECT
public:
BundleCreator(void);
~BundleCreator(void);
};
#endif

377
YACReaderLibrary/classic_comics_view.cpp Normal file
View File

@ -0,0 +1,377 @@
#include "classic_comics_view.h"
#include "QStackedWidget"
#include "comic_flow_widget.h"
#include "QsLog.h"
#include "shortcuts_manager.h"
#include "yacreader_table_view.h"
#include "yacreader_tool_bar_stretch.h"
ClassicComicsView::ClassicComicsView(QWidget *parent)
:ComicsView(parent),searching(false)
{
QHBoxLayout * layout = new QHBoxLayout;
settings = new QSettings(YACReader::getSettingsPath()+"/YACReaderLibrary.ini",QSettings::IniFormat); //TODO unificar la creación del fichero de config con el servidor
settings->beginGroup("libraryConfig");
//FLOW-----------------------------------------------------------------------
//---------------------------------------------------------------------------
//FORCE_ANGLE is not used here, because ComicFlowWidgetGL will use OpenGL ES in the future
#ifndef NO_OPENGL
if((settings->value(USE_OPEN_GL).toBool() == true))
comicFlow = new ComicFlowWidgetGL(0);
else
comicFlow = new ComicFlowWidgetSW(0);
#else
comicFlow = new ComicFlowWidgetSW(0);
#endif
comicFlow->updateConfig(settings);
comicFlow->setFocusPolicy(Qt::StrongFocus);
comicFlow->setShowMarks(true);
setFocusProxy(comicFlow);
comicFlow->setFocus(Qt::OtherFocusReason);
comicFlow->setContextMenuPolicy(Qt::CustomContextMenu);
//layout-----------------------------------------------
sVertical = new QSplitter(Qt::Vertical); //spliter derecha
stack = new QStackedWidget;
stack->addWidget(comicFlow);
setupSearchingIcon();
stack->addWidget(searchingIcon);
sVertical->addWidget(stack);
comics = new QWidget;
QVBoxLayout * comicsLayout = new QVBoxLayout;
comicsLayout->setSpacing(0);
comicsLayout->setContentsMargins(0,0,0,0);
//TODO ComicsView:(set toolbar) comicsLayout->addWidget(editInfoToolBar);
tableView = new YACReaderTableView;
tableView->verticalHeader()->hide();
tableView->setFocusPolicy(Qt::StrongFocus);
comicsLayout->addWidget(tableView);
comics->setLayout(comicsLayout);
sVertical->addWidget(comics);
tableView->setContextMenuPolicy(Qt::CustomContextMenu);
//config--------------------------------------------------
if(settings->contains(COMICS_VIEW_HEADERS))
tableView->horizontalHeader()->restoreState(settings->value(COMICS_VIEW_HEADERS).toByteArray());
//connections---------------------------------------------
connect(tableView, SIGNAL(clicked(QModelIndex)), this, SLOT(centerComicFlow(QModelIndex)));
connect(tableView, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(selectedComicForOpening(QModelIndex)));
connect(comicFlow, SIGNAL(centerIndexChanged(int)), this, SLOT(updateTableView(int)));
connect(tableView, SIGNAL(comicRated(int,QModelIndex)), this, SIGNAL(comicRated(int,QModelIndex)));
connect(comicFlow, SIGNAL(selected(uint)), this, SIGNAL(selected(uint)));
connect(tableView->horizontalHeader(), SIGNAL(sectionMoved(int,int,int)), this, SLOT(saveTableHeadersStatus()));
connect(tableView->horizontalHeader(), SIGNAL(sectionResized(int,int,int)), this, SLOT(saveTableHeadersStatus()));
connect(comicFlow, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(requestedViewContextMenu(QPoint)));
connect(tableView, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(requestedItemContextMenu(QPoint)));
layout->addWidget(sVertical);
setLayout(layout);
layout->setMargin(0);
#ifdef Q_OS_MAC
sVertical->setCollapsible(1,false);
#endif
if(settings->contains(COMICS_VIEW_FLOW_SPLITTER_STATUS))
sVertical->restoreState(settings->value(COMICS_VIEW_FLOW_SPLITTER_STATUS).toByteArray());
//hide flow widgets
hideFlowViewAction = new QAction(this);
hideFlowViewAction->setText(tr("Hide comic flow"));
hideFlowViewAction->setData(HIDE_COMIC_VIEW_ACTION_YL);
hideFlowViewAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(HIDE_COMIC_VIEW_ACTION_YL));
hideFlowViewAction->setIcon(QIcon(":/images/comics_view_toolbar/hideComicFlow.png"));
hideFlowViewAction->setCheckable(true);
hideFlowViewAction->setChecked(false);
connect(hideFlowViewAction, SIGNAL(toggled(bool)),this, SLOT(hideComicFlow(bool)));
}
void ClassicComicsView::hideComicFlow(bool hide)
{
if(hide)
{
QList<int> sizes;
sizes.append(0);
int total = sVertical->sizes().at(0) + sVertical->sizes().at(1);
sizes.append(total);
sVertical->setSizes(sizes);
}
else
{
QList<int> sizes;
int total = sVertical->sizes().at(0) + sVertical->sizes().at(1);
sizes.append(2*total/3);
sizes.append(total/3);
sVertical->setSizes(sizes);
}
}
//the toolbar has to be populated
void ClassicComicsView::setToolBar(QToolBar *toolBar)
{
static_cast<QVBoxLayout *>(comics->layout())->insertWidget(0,toolBar);
this->toolbar = toolBar;
toolBarStretch = new YACReaderToolBarStretch(this);
toolBarStretchAction = toolBar->addWidget(toolBarStretch);
toolBar->addAction(hideFlowViewAction);
}
void ClassicComicsView::setModel(ComicModel *model)
{
ComicsView::setModel(model);
if(model == NULL)
{
comicFlow->clear();
}
else
{
connect(model, SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector<int>)), this, SLOT(applyModelChanges(QModelIndex,QModelIndex,QVector<int>)),Qt::UniqueConnection);
connect(model, SIGNAL(rowsRemoved(QModelIndex,int,int)), this, SLOT(removeItemsFromFlow(QModelIndex,int,int)),Qt::UniqueConnection);
connect(model, SIGNAL(resortedIndexes(QList<int>)),comicFlow,SLOT(resortCovers(QList<int>)),Qt::UniqueConnection);
connect(model, SIGNAL(newSelectedIndex(QModelIndex)),this,SLOT(setCurrentIndex(QModelIndex)),Qt::UniqueConnection);
tableView->setModel(model);
if(model->rowCount()>0)
tableView->setCurrentIndex(model->index(0,0));
tableView->horizontalHeader()->setDefaultAlignment(Qt::AlignLeft);
#if QT_VERSION >= 0x050000
tableView->horizontalHeader()->setSectionsMovable(true);
#else
tableView->horizontalHeader()->setMovable(true);
#endif
//TODO parametrizar la configuración de las columnas
/*if(!settings->contains(COMICS_VIEW_HEADERS))
{*/
for(int i = 0;i<tableView->horizontalHeader()->count();i++)
tableView->horizontalHeader()->hideSection(i);
tableView->horizontalHeader()->showSection(ComicModel::Number);
tableView->horizontalHeader()->showSection(ComicModel::Title);
tableView->horizontalHeader()->showSection(ComicModel::FileName);
tableView->horizontalHeader()->showSection(ComicModel::NumPages);
tableView->horizontalHeader()->showSection(ComicModel::Hash); //Size is part of the Hash...TODO add Columns::Size to Columns
tableView->horizontalHeader()->showSection(ComicModel::ReadColumn);
tableView->horizontalHeader()->showSection(ComicModel::CurrentPage);
tableView->horizontalHeader()->showSection(ComicModel::Rating);
//}
//debido a un bug, qt4 no es capaz de ajustar el ancho teniendo en cuenta todas la filas (no sólo las visibles)
//así que se ecala la primera vez y después se deja el control al usuario.
//if(!settings->contains(COMICS_VIEW_HEADERS))
QStringList paths = model->getPaths(model->getCurrentPath());//TODO ComicsView: get currentpath from somewhere currentPath());
comicFlow->setImagePaths(paths);
comicFlow->setMarks(model->getReadList());
//comicFlow->setFocus(Qt::OtherFocusReason);
if(settings->contains(COMICS_VIEW_HEADERS))
tableView->horizontalHeader()->restoreState(settings->value(COMICS_VIEW_HEADERS).toByteArray());
tableView->resizeColumnsToContents();
tableView->horizontalHeader()->setStretchLastSection(true);
}
}
void ClassicComicsView::setCurrentIndex(const QModelIndex &index)
{
tableView->setCurrentIndex(index);
centerComicFlow(index);
}
QModelIndex ClassicComicsView::currentIndex()
{
return tableView->currentIndex();
}
QItemSelectionModel *ClassicComicsView::selectionModel()
{
return tableView->selectionModel();
}
void ClassicComicsView::scrollTo(const QModelIndex & mi, QAbstractItemView::ScrollHint hint)
{
Q_UNUSED(hint);
comicFlow->setCenterIndex(mi.row());
}
void ClassicComicsView::toFullScreen()
{
comicFlow->hide();
comicFlow->setCenterIndex(comicFlow->centerIndex());
comics->hide();
//showFullScreen() //parent windows
comicFlow->show();
comicFlow->setFocus(Qt::OtherFocusReason);
}
void ClassicComicsView::toNormal()
{
comicFlow->hide();
comicFlow->setCenterIndex(comicFlow->centerIndex());
comicFlow->render();
comics->show();
comicFlow->show();
}
void ClassicComicsView::updateConfig(QSettings *settings)
{
comicFlow->updateConfig(settings);
}
void ClassicComicsView::enableFilterMode(bool enabled)
{
if(enabled)
{
comicFlow->clear();
if(previousSplitterStatus.isEmpty())
previousSplitterStatus = sVertical->saveState();
sVertical->setSizes(QList<int> () << 100 << 10000000);
showSearchingIcon();
}else
{
hideSearchingIcon();
sVertical->restoreState(previousSplitterStatus);
previousSplitterStatus.clear();
}
//sVertical->setCollapsible(0,!enabled);
searching = enabled;
}
void ClassicComicsView::selectIndex(int index)
{
tableView->selectRow(index);
}
void ClassicComicsView::selectAll()
{
tableView->selectAll();
}
void ClassicComicsView::selectedComicForOpening(const QModelIndex &mi)
{
emit selected(mi.row());
}
void ClassicComicsView::requestedViewContextMenu(const QPoint &point)
{
emit customContextMenuViewRequested(comicFlow->mapTo(this, point));
}
void ClassicComicsView::requestedItemContextMenu(const QPoint &point)
{
emit customContextMenuItemRequested(tableView->mapTo(this, point));
}
void ClassicComicsView::setShowMarks(bool show)
{
comicFlow->setShowMarks(show);
}
void ClassicComicsView::centerComicFlow(const QModelIndex & mi)
{
comicFlow->showSlide(mi.row());
comicFlow->setFocus(Qt::OtherFocusReason);
}
void ClassicComicsView::updateTableView(int i)
{
QModelIndex mi = model->index(i,2);
tableView->setCurrentIndex(mi);
tableView->scrollTo(mi,QAbstractItemView::EnsureVisible);
}
void ClassicComicsView::saveTableHeadersStatus()
{
settings->setValue(COMICS_VIEW_HEADERS,tableView->horizontalHeader()->saveState());
}
void ClassicComicsView::saveSplitterStatus()
{
settingsMutex.lock();
if(!searching)
settings->setValue(COMICS_VIEW_FLOW_SPLITTER_STATUS, sVertical->saveState());
settingsMutex.unlock();
}
void ClassicComicsView::applyModelChanges(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles)
{
Q_UNUSED(topLeft);
Q_UNUSED(bottomRight);
if(roles.contains(ComicModel::ReadColumnRole))
{
comicFlow->setMarks(model->getReadList());
comicFlow->updateMarks();
}
}
void ClassicComicsView::removeItemsFromFlow(const QModelIndex &parent, int from, int to)
{
Q_UNUSED(parent);
for(int i = from; i<=to; i++)
comicFlow->remove(i);
}
void ClassicComicsView::closeEvent(QCloseEvent *event)
{
toolbar->removeAction(toolBarStretchAction);
toolbar->removeAction(hideFlowViewAction);
saveTableHeadersStatus();
saveSplitterStatus();
ComicsView::closeEvent(event);
}
void ClassicComicsView::setupSearchingIcon()
{
searchingIcon = new QWidget(comicFlow);
QHBoxLayout * h = new QHBoxLayout;
QPixmap p(":/images/searching_icon.png");
QLabel * l = new QLabel(searchingIcon);
l->setPixmap(p);
l->setFixedSize(p.size());
h->addWidget(l,0,Qt::AlignCenter);
searchingIcon->setLayout(h);
QPalette pal(searchingIcon->palette());
pal.setColor(QPalette::Background, Qt::black);
searchingIcon->setAutoFillBackground(true);
searchingIcon->setPalette(pal);
hideSearchingIcon();
}
void ClassicComicsView::showSearchingIcon()
{
stack->setCurrentWidget(searchingIcon);
}
void ClassicComicsView::hideSearchingIcon()
{
stack->setCurrentWidget(comicFlow);
}

79
YACReaderLibrary/classic_comics_view.h Normal file
View File

@ -0,0 +1,79 @@
#ifndef CLASSIC_COMICS_VIEW_H
#define CLASSIC_COMICS_VIEW_H
#include "comics_view.h"
#include <QModelIndex>
#include <QModelIndexList>
class QSplitter;
class QStackedWidget;
class QToolBar;
class ComicFlowWidget;
class ComicModel;
class YACReaderTableView;
class YACReaderToolBarStretch;
class ClassicComicsView : public ComicsView
{
Q_OBJECT
public:
ClassicComicsView(QWidget *parent = 0);
void setToolBar(QToolBar * toolBar);
void setModel(ComicModel *model);
QModelIndex currentIndex();
QItemSelectionModel * selectionModel();
void scrollTo(const QModelIndex & mi, QAbstractItemView::ScrollHint hint );
void toFullScreen();
void toNormal();
void updateConfig(QSettings * settings);
void enableFilterMode(bool enabled);
void selectIndex(int index);
public slots:
void setCurrentIndex(const QModelIndex &index);
void centerComicFlow(const QModelIndex & mi);
void updateTableView(int i);
void saveTableHeadersStatus();
void saveSplitterStatus();
void applyModelChanges(const QModelIndex & topLeft,const QModelIndex & bottomRight,const QVector<int> & roles);
void removeItemsFromFlow(const QModelIndex & parent, int from, int to);
//ComicsView
void setShowMarks(bool show);
void selectAll();
void selectedComicForOpening(const QModelIndex & mi);
protected slots:
void hideComicFlow(bool hide);
void requestedViewContextMenu(const QPoint & point);
void requestedItemContextMenu(const QPoint & point);
private:
YACReaderTableView * tableView;
YACReaderToolBarStretch * toolBarStretch;
QAction * toolBarStretchAction;
QToolBar * toolbar;
QWidget *comics;
QSplitter * sVertical;
ComicFlowWidget * comicFlow;
QSettings * settings;
void closeEvent ( QCloseEvent * event );
QAction * hideFlowViewAction;
QStackedWidget * stack;
QByteArray previousSplitterStatus;
QWidget * searchingIcon;
bool searching;
void setupSearchingIcon();
void showSearchingIcon();
void hideSearchingIcon();
void updateSearchingIconPosition();
QMutex settingsMutex;
};
#endif // CLASSIC_COMICS_VIEW_H

108
YACReaderLibrary/comic_files_manager.cpp Normal file
View File

@ -0,0 +1,108 @@
#include "comic_files_manager.h"
#include <QFile>
#include <QFileInfo>
#include <QDir>
#include <QsLog.h>
#include "comic.h"
ComicFilesManager::ComicFilesManager(QObject *parent) :
QObject(parent), canceled(false)
{
}
void ComicFilesManager::copyComicsTo(const QList<QPair<QString,QString> > &sourceComics, const QString &folderDest, const QModelIndex & dest)
{
comics = sourceComics;
folder = folderDest;
folderDestinationModelIndex = dest;
move = false;
}
void ComicFilesManager::moveComicsTo(const QList<QPair<QString, QString> > &sourceComics, const QString &folderDest, const QModelIndex &dest)
{
comics = sourceComics;
folder = folderDest;
folderDestinationModelIndex = dest;
move = true;
}
QList<QPair<QString, QString> > ComicFilesManager::getDroppedFiles(const QList<QUrl> &urls)
{
QList<QPair<QString,QString> > dropedFiles;
QString currentPath;
foreach(QUrl url, urls)
{
currentPath = url.toLocalFile();
if(currentPath.endsWith('/'))
currentPath = currentPath.remove(currentPath.length()-1,1); //QTBUG-35896 QUrl.toLocalFile inconsistency.
if(Comic::fileIsComic(currentPath))
dropedFiles << QPair<QString, QString>(currentPath,"/");
else
{
QLOG_DEBUG() << "XXXXXXXXXXXX :" << currentPath;
QFileInfo info(currentPath);
if(info.isDir())
{
QLOG_DEBUG() << "origin path prior to absoluteFilePath : " << info.absolutePath();
foreach(QString comicPath, Comic::findValidComicFilesInFolder(info.absoluteFilePath()))
{
QFileInfo comicInfo(comicPath);
QString path = comicInfo.absolutePath();
QLOG_DEBUG() << "comic path : " << comicPath;
QLOG_DEBUG() << "full comic path : " << path;
QLOG_DEBUG() << "origin path : " << info.absolutePath();
dropedFiles << QPair<QString, QString>(comicPath, path.remove(info.absolutePath()));
}
}
}
}
return dropedFiles;
}
void ComicFilesManager::process()
{
int i=0;
bool successProcesingFiles = false;
QPair<QString, QString> source;
foreach (source, comics) {
if(canceled)
{
if(successProcesingFiles)
emit success(folderDestinationModelIndex);
emit finished();
return; //TODO rollback?
}
QFileInfo info(source.first);
QString destPath = QDir::cleanPath(folder+'/'+source.second);
QLOG_DEBUG() << "crear : " << destPath;
QDir().mkpath(destPath);
if(QFile::copy(source.first, QDir::cleanPath(destPath+'/'+info.fileName())))
{
successProcesingFiles = true;
if(move)
{
QFile::remove(source.first); //TODO: remove the whole path....
}
}
i++;
emit progress(i);
}
if(successProcesingFiles)
emit success(folderDestinationModelIndex);
emit finished();
}
void ComicFilesManager::cancel()
{
QLOG_DEBUG() << "Operation canceled";
canceled = true;
}

37
YACReaderLibrary/comic_files_manager.h Normal file
View File

@ -0,0 +1,37 @@
#ifndef COMIC_FILES_MANAGER_H
#define COMIC_FILES_MANAGER_H
#include <QObject>
#include <QList>
#include <QPair>
#include <QModelIndex>
//this class is intended to work in background, just use moveToThread and process to start working
class ComicFilesManager : public QObject
{
Q_OBJECT
public:
explicit ComicFilesManager(QObject *parent = 0);
void copyComicsTo(const QList<QPair<QString,QString> > & sourceComics, const QString & folderDest, const QModelIndex &dest);
void moveComicsTo(const QList<QPair<QString,QString> > & comics, const QString & folderDest, const QModelIndex &dest);
static QList<QPair<QString, QString> > getDroppedFiles(const QList<QUrl> & urls);
signals:
void currentComic(QString);
void progress(int);
void finished();
void success(QModelIndex); //at least one comics has been copied or moved
public slots:
void process();
void cancel();
protected:
bool move;
bool canceled;
QList<QPair<QString,QString> > comics;
QString folder;
QModelIndex folderDestinationModelIndex;
};
#endif // COMIC_FILES_MANAGER_H

265
YACReaderLibrary/comic_flow.cpp Normal file
View File

@ -0,0 +1,265 @@
#include "comic_flow.h"
#include "qnaturalsorting.h"
#include "yacreader_global.h"
#include <algorithm>
#include <QMutex>
#include <QImageReader>
#include <QTimer>
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()));
connect(this, SIGNAL(centerIndexChangedSilent(int)), this, SLOT(preload()));
setReflectionEffect(PlainReflection);
}
ComicFlow::~ComicFlow()
{
worker->terminate();
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++;
imagesLoaded[idx]=true;
}
}
// 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];
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();
}
void ComicFlow::removeSlide(int cover)
{
worker->lock();
worker->reset();
imageFiles.removeAt(cover);
if(imagesLoaded[cover])
numImagesLoaded--;
imagesLoaded.remove(cover);
imagesSetted.remove(cover);
YACReaderFlow::removeSlide(cover);
worker->unlock();
preload();
}
void ComicFlow::resortCovers(QList<int> newOrder)
{
worker->lock();
worker->reset();
YACReaderFlow::resortCovers(newOrder);
QStringList imageFilesNew;
QVector<bool> imagesLoadedNew;
QVector<bool> imagesSettedNew;
foreach(int index, newOrder)
{
imageFilesNew << imageFiles.at(index);
imagesLoadedNew << imagesLoaded.at(index);
imagesSettedNew << imagesSetted.at(index);
}
imageFiles = imageFilesNew;
imagesLoaded = imagesLoadedNew;
imagesSetted = imagesSettedNew;
worker->unlock();
}
//-----------------------------------------------------------------------------
//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::lock()
{
mutex.lock();
}
void ImageLoader::unlock()
{
mutex.unlock();
}
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;
}

78
YACReaderLibrary/comic_flow.h Normal file
View File

@ -0,0 +1,78 @@
#ifndef __COMICFLOW_H
#define __COMICFLOW_H
#include "yacreader_flow.h"
#include <QtCore>
#include <QObject>
#include <QThread>
#include <QImage>
#include <QMutex>
#include <QWaitCondition>
#include <QString>
#include <QWheelEvent>
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);
void removeSlide(int cover);
void resortCovers(QList<int> newOrder);
private slots:
void preload();
void updateImageData();
private:
//QString imagePath;
QStringList imageFiles;
QVector<bool> imagesLoaded;
QVector<bool> imagesSetted;
int 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; };
void lock();
void unlock();
QImage result();
protected:
void run();
private:
QMutex mutex;
QWaitCondition condition;
bool restart;
bool working;
int idx;
QString fileName;
QSize size;
QImage img;
};
#endif

355
YACReaderLibrary/comic_flow_widget.cpp Normal file
View File

@ -0,0 +1,355 @@
#include "comic_flow_widget.h"
#include <QVBoxLayout>
ComicFlowWidget::ComicFlowWidget(QWidget * parent)
:QWidget(parent)
{
}
ComicFlowWidgetSW::ComicFlowWidgetSW(QWidget * parent)
:ComicFlowWidget(parent)
{
flow = new ComicFlow(parent);
connect(flow,SIGNAL(centerIndexChanged(int)),this,SIGNAL(centerIndexChanged(int)));
connect(flow,SIGNAL(selected(unsigned int)),this,SIGNAL(selected(unsigned int)));
QVBoxLayout * l = new QVBoxLayout;
l->addWidget(flow);
setLayout(l);
//TODO eleminar "padding"
QPalette Pal(palette());
// set black background
Pal.setColor(QPalette::Background, Qt::black);
setAutoFillBackground(true);
setPalette(Pal);
//config
QMatrix m;
m.rotate(-90);
m.scale(-1,1);
QImage image(":/images/setRead.png");
QImage imageTransformed = image.transformed(m,Qt::SmoothTransformation);
setMarkImage(imageTransformed);
}
QSize ComicFlowWidgetSW::minimumSizeHint() const
{
return flow->minimumSizeHint();
}
QSize ComicFlowWidgetSW::sizeHint() const
{
return flow->sizeHint();
}
void ComicFlowWidgetSW::setShowMarks(bool value)
{
flow->setShowMarks(value);
}
void ComicFlowWidgetSW::setMarks(QVector<YACReaderComicReadStatus> marks)
{
flow->setMarks(marks);
}
void ComicFlowWidgetSW::setMarkImage(QImage & image)
{
flow->setMarkImage(image);
}
void ComicFlowWidgetSW::markSlide(int index, YACReaderComicReadStatus status)
{
flow->markSlide(index,status);
}
void ComicFlowWidgetSW::unmarkSlide(int index)
{
flow->unmarkSlide(index);
}
void ComicFlowWidgetSW::setSlideSize(QSize size)
{
flow->setSlideSize(size);
}
void ComicFlowWidgetSW::clear()
{
flow->clear();
}
void ComicFlowWidgetSW::setImagePaths(QStringList paths)
{
flow->setImagePaths(paths);
}
void ComicFlowWidgetSW::setCenterIndex(int index)
{
flow->setCenterIndex(index);
}
void ComicFlowWidgetSW::showSlide(int index)
{
flow->showSlide(index);
}
int ComicFlowWidgetSW::centerIndex()
{
return flow->centerIndex();
}
void ComicFlowWidgetSW::updateMarks()
{
flow->updateMarks();
}
void ComicFlowWidgetSW::setFlowType(FlowType flowType)
{
flow->setFlowType(flowType);
}
void ComicFlowWidgetSW::render()
{
flow->render();
}
void ComicFlowWidgetSW::keyPressEvent(QKeyEvent* event)
{
flow->keyPressEvent(event);
}
void ComicFlowWidgetSW::paintEvent(QPaintEvent *event)
{
flow->paintEvent(event);
}
void ComicFlowWidgetSW::mousePressEvent(QMouseEvent* event)
{
flow->mousePressEvent(event);
}
void ComicFlowWidgetSW::resizeEvent(QResizeEvent* event)
{
flow->resizeEvent(event);
}
void ComicFlowWidgetSW::mouseDoubleClickEvent(QMouseEvent* event)
{
flow->mouseDoubleClickEvent(event);
}
void ComicFlowWidgetSW::updateConfig(QSettings * settings)
{
switch (settings->value(FLOW_TYPE_SW).toInt())
{
case CoverFlowLike:
flow->setFlowType(CoverFlowLike);
return;
case Strip:
flow->setFlowType(Strip);
return;
case StripOverlapped:
flow->setFlowType(StripOverlapped);
return;
}
}
void ComicFlowWidgetSW::remove(int cover)
{
flow->removeSlide(cover);
}
void ComicFlowWidgetSW::resortCovers(QList<int> newOrder)
{
flow->resortCovers(newOrder);
}
#ifndef NO_OPENGL
//////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////
///OpenGL ComicFlow
//////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////
ComicFlowWidgetGL::ComicFlowWidgetGL(QWidget * parent)
:ComicFlowWidget(parent)
{
flow = new YACReaderComicFlowGL(parent);
connect(flow,SIGNAL(centerIndexChanged(int)),this,SIGNAL(centerIndexChanged(int)));
connect(flow,SIGNAL(selected(unsigned int)),this,SIGNAL(selected(unsigned int)));
QVBoxLayout * l = new QVBoxLayout;
l->addWidget(flow);
l->setContentsMargins(0,0,0,0);
setLayout(l);
//TODO eleminar "padding"
QPalette Pal(palette());
// set black background
Pal.setColor(QPalette::Background, Qt::black);
setAutoFillBackground(true);
setPalette(Pal);
}
QSize ComicFlowWidgetGL::minimumSizeHint() const
{
return flow->minimumSizeHint();
}
QSize ComicFlowWidgetGL::sizeHint() const
{
return flow->sizeHint();
}
void ComicFlowWidgetGL::setShowMarks(bool value)
{
flow->setShowMarks(value);
}
void ComicFlowWidgetGL::setMarks(QVector<YACReaderComicReadStatus> marks)
{
flow->setMarks(marks);
}
void ComicFlowWidgetGL::setMarkImage(QImage & image)
{
flow->setMarkImage(image);
}
void ComicFlowWidgetGL::markSlide(int index, YACReaderComicReadStatus status)
{
flow->markSlide(index,status);
}
void ComicFlowWidgetGL::unmarkSlide(int index)
{
flow->unmarkSlide(index);
}
void ComicFlowWidgetGL::setSlideSize(QSize size)
{
flow->setSlideSize(size);
}
void ComicFlowWidgetGL::clear()
{
flow->clear();
}
void ComicFlowWidgetGL::setImagePaths(QStringList paths)
{
flow->setImagePaths(paths);
}
void ComicFlowWidgetGL::setCenterIndex(int index)
{
flow->setCenterIndex(index);
}
void ComicFlowWidgetGL::showSlide(int index)
{
flow->showSlide(index);
}
int ComicFlowWidgetGL::centerIndex()
{
return flow->centerIndex();
}
void ComicFlowWidgetGL::updateMarks()
{
flow->updateMarks();
}
void ComicFlowWidgetGL::setFlowType(FlowType flowType)
{
if(flowType == CoverFlowLike)
flow->setPreset(presetYACReaderFlowClassicConfig);
else if(flowType == Strip)
flow->setPreset(presetYACReaderFlowStripeConfig);
else if(flowType == StripOverlapped)
flow->setPreset(presetYACReaderFlowOverlappedStripeConfig);
else
flow->setPreset(defaultYACReaderFlowConfig);
}
void ComicFlowWidgetGL::render()
{
flow->render();
}
void ComicFlowWidgetGL::keyPressEvent(QKeyEvent* event)
{
flow->keyPressEvent(event);
}
void ComicFlowWidgetGL::paintEvent(QPaintEvent *event)
{
//flow->paintEvent(event);
ComicFlowWidget::paintEvent(event);
}
void ComicFlowWidgetGL::mousePressEvent(QMouseEvent* event)
{
flow->mousePressEvent(event);
}
void ComicFlowWidgetGL::resizeEvent(QResizeEvent* event)
{
flow->resizeGL(event->size().width(),event->size().height());
}
void ComicFlowWidgetGL::mouseDoubleClickEvent(QMouseEvent* event)
{
flow->mouseDoubleClickEvent(event);
}
void ComicFlowWidgetGL::updateConfig(QSettings * settings)
{
Performance performance = medium;
switch (settings->value(PERFORMANCE).toInt())
{
case 0:
performance = low;
break;
case 1:
performance = medium;
break;
case 2:
performance = high;
break;
case 3:
performance = ultraHigh;
break;
}
flow->setPerformance(performance);
if(!settings->contains(V_SYNC))
flow->useVSync(false);
else
flow->useVSync(settings->value(V_SYNC).toBool());
switch (settings->value(FLOW_TYPE_GL).toInt())
{
case 0:
flow->setPreset(presetYACReaderFlowClassicConfig);
return;
case 1:
flow->setPreset(presetYACReaderFlowStripeConfig);
return;
case 2:
flow->setPreset(presetYACReaderFlowOverlappedStripeConfig);
return;
case 3:
flow->setPreset(defaultYACReaderFlowConfig);
return;
case 4:
flow->setPreset(pressetYACReaderFlowDownConfig);
return;
}
//custom config
flow->setCF_RX(settings->value(X_ROTATION).toInt());
flow->setCF_Y(settings->value(Y_POSITION).toInt());
flow->setX_Distance(settings->value(COVER_DISTANCE).toInt());
flow->setCenter_Distance(settings->value(CENTRAL_DISTANCE).toInt());
flow->setCF_Z(settings->value(ZOOM_LEVEL).toInt());
flow->setY_Distance(settings->value(Y_COVER_OFFSET).toInt());
flow->setZ_Distance(settings->value(Z_COVER_OFFSET).toInt());
flow->setRotation(settings->value(COVER_ROTATION).toInt());
flow->setFadeOutDist(settings->value(FADE_OUT_DIST).toInt());
flow->setLightStrenght(settings->value(LIGHT_STRENGTH).toInt());
flow->setMaxAngle(settings->value(MAX_ANGLE).toInt());
/* flow->setVisibility(settings->value("visibilityDistance").toInt());
flow->setLightStrenght(settings->value("lightStrength").toInt())*/;
}
void ComicFlowWidgetGL::remove(int cover)
{
flow->remove(cover);
}
void ComicFlowWidgetGL::resortCovers(QList<int> newOrder)
{
flow->resortCovers(newOrder);
}
#endif
//void ComicFlowWidgetGL::setCF_RX(int value){ flow->setCF_RX(value);}
//void ComicFlowWidgetGL::setCF_RY(int value){ flow->setCF_RY(value);}
//void ComicFlowWidgetGL::setCF_RZ(int value){ flow->setCF_RZ(value);}
//void ComicFlowWidgetGL::setZoom(int zoom){ flow->setZoom(zoom);}
//void ComicFlowWidgetGL::setRotation(int angle){ flow->setRotation(angle);}
//void ComicFlowWidgetGL::setX_Distance(int distance){ flow->setX_Distance(distance);}
//void ComicFlowWidgetGL::setCenter_Distance(int distance){ flow->setCenter_Distance(distance);}
//void ComicFlowWidgetGL::setZ_Distance(int distance){ flow->setZ_Distance(distance);}
//void ComicFlowWidgetGL::setCF_Y(int value){ flow->setCF_Y(value);}
//void ComicFlowWidgetGL::setY_Distance(int value){ flow->setY_Distance(value);}
//void ComicFlowWidgetGL::setPreset(const Preset & p){ flow->setPreset(p);}

133
YACReaderLibrary/comic_flow_widget.h Normal file
View File

@ -0,0 +1,133 @@
#ifndef __COMIC_FLOW_WIDGET_H
#define __COMIC_FLOW_WIDGET_H
#include <QWidget>
#include "pictureflow.h"
#include "comic_flow.h"
#ifndef NO_OPENGL
#include "yacreader_flow_gl.h"
#endif
class ComicFlowWidget : public QWidget
{
Q_OBJECT
public:
ComicFlowWidget(QWidget * paret = 0);
public slots:
virtual void setShowMarks(bool value) = 0;
virtual void setMarks(QVector<YACReaderComicReadStatus> marks) = 0;
virtual void setMarkImage(QImage & image) = 0;
virtual void markSlide(int index, YACReaderComicReadStatus status) = 0;
virtual void unmarkSlide(int index) = 0;
virtual void setSlideSize(QSize size) = 0;
virtual void clear() = 0;
virtual void setImagePaths(QStringList paths) = 0;
virtual void setCenterIndex(int index) = 0;
virtual void showSlide(int index) = 0;
virtual int centerIndex() = 0;
virtual void updateMarks() = 0;
virtual void setFlowType(FlowType flowType) = 0;
virtual void render() = 0;
virtual void updateConfig(QSettings * settings) = 0;
virtual void remove(int cover) = 0;
virtual void resortCovers(QList<int> newOrder) = 0;
signals:
void centerIndexChanged(int);
void selected(unsigned int);
};
class ComicFlowWidgetSW : public ComicFlowWidget
{
Q_OBJECT
private:
ComicFlow * flow;
public:
ComicFlowWidgetSW(QWidget * parent = 0);
void setShowMarks(bool value);
void setMarks(QVector<YACReaderComicReadStatus> marks);
void setMarkImage(QImage & image);
void markSlide(int index, YACReaderComicReadStatus status);
void unmarkSlide(int index);
void setSlideSize(QSize size);
void clear();
void setImagePaths(QStringList paths);
void setCenterIndex(int index);
void showSlide(int index);
int centerIndex();
void updateMarks();
void setFlowType(FlowType flowType);
void render();
void updateConfig(QSettings * settings);
void remove(int cover);
void resortCovers(QList<int> newOrder);
protected:
void keyPressEvent(QKeyEvent* event);
void paintEvent(QPaintEvent *event);
void mousePressEvent(QMouseEvent* event);
void resizeEvent(QResizeEvent* event);
void mouseDoubleClickEvent(QMouseEvent* event);
QSize minimumSizeHint() const;
QSize sizeHint() const;
QSize slideSizeW;
QSize slideSizeF;
};
#ifndef NO_OPENGL
class ComicFlowWidgetGL : public ComicFlowWidget
{
Q_OBJECT
private:
YACReaderComicFlowGL * flow;
public:
ComicFlowWidgetGL(QWidget * parent = 0);
void setShowMarks(bool value);
void setMarks(QVector<YACReaderComicReadStatus> marks);
void setMarkImage(QImage & image);
void markSlide(int index, YACReaderComicReadStatus status);
void unmarkSlide(int index);
void setSlideSize(QSize size);
void clear();
void setImagePaths(QStringList paths);
void setCenterIndex(int index);
void showSlide(int index);
int centerIndex();
void updateMarks();
void setFlowType(FlowType flowType);
void render();
void updateConfig(QSettings * settings);
void remove(int cover);
void resortCovers(QList<int> newOrder);
//public slots:
// void setCF_RX(int value);
// //the Y Rotation of the Coverflow
// void setCF_RY(int value);
// //the Z Rotation of the Coverflow
// void setCF_RZ(int value);
// //perspective
// void setZoom(int zoom);
// void setRotation(int angle);
// //sets the distance between the covers
// void setX_Distance(int distance);
// //sets the distance between the centered and the non centered covers
// void setCenter_Distance(int distance);
// //sets the pushback amount
// void setZ_Distance(int distance);
// void setCF_Y(int value);
// void setY_Distance(int value);
// void setPreset(const Preset & p);
protected:
void keyPressEvent(QKeyEvent* event);
void paintEvent(QPaintEvent *event);
void mousePressEvent(QMouseEvent* event);
void resizeEvent(QResizeEvent* event);
void mouseDoubleClickEvent(QMouseEvent* event);
QSize minimumSizeHint() const;
QSize sizeHint() const;
};
#endif
#endif

68
YACReaderLibrary/comic_vine/api_key_dialog.cpp Normal file
View File

@ -0,0 +1,68 @@
#include "api_key_dialog.h"
#include <QVBoxLayout>
#include <QHBoxLayout>
#include <QLabel>
#include <QLineEdit>
#include <QPushButton>
#include <QSettings>
#include "yacreader_global_gui.h"
ApiKeyDialog::ApiKeyDialog(QWidget *parent) :
QDialog(parent)
{
QVBoxLayout * layout = new QVBoxLayout;
QHBoxLayout * buttonsLayout = new QHBoxLayout;
settings = new QSettings(YACReader::getSettingsPath()+"/YACReaderLibrary.ini",QSettings::IniFormat); //TODO unificar la creación del fichero de config con el servidor
settings->beginGroup("ComicVine");
QLabel * info = new QLabel(tr("Before you can connect to Comic Vine, you need your own API key. Please, get one free <a href=\"http://www.comicvine.com/api/\">here</a>"));
info->setWordWrap(true);
info->setOpenExternalLinks(true);
edit = new QLineEdit();
edit->setPlaceholderText(tr("Paste here your Comic Vine API key"));
connect(edit,SIGNAL(textChanged(QString)),this,SLOT(enableAccept(QString)));
acceptButton = new QPushButton(tr("Accept"));
acceptButton->setDisabled(true);
connect(acceptButton,SIGNAL(clicked()),this,SLOT(saveApiKey()));
cancelButton = new QPushButton(tr("Cancel"));
connect(cancelButton,SIGNAL(clicked()),this,SLOT(reject()));
layout->addWidget(info);
layout->addWidget(edit);
layout->addStretch();
buttonsLayout->addStretch();
buttonsLayout->addWidget(acceptButton);
buttonsLayout->addWidget(cancelButton);
layout->addLayout(buttonsLayout);
setLayout(layout);
resize(400,150);
if(settings->contains(COMIC_VINE_API_KEY))
edit->setText(settings->value(COMIC_VINE_API_KEY).toString());
}
ApiKeyDialog::~ApiKeyDialog()
{
delete settings;
}
void ApiKeyDialog::enableAccept(const QString &text)
{
//TODO key validation
acceptButton->setEnabled(!text.isEmpty());
}
void ApiKeyDialog::saveApiKey()
{
settings->setValue(COMIC_VINE_API_KEY,edit->text());
accept();
}

31
YACReaderLibrary/comic_vine/api_key_dialog.h Normal file
View File

@ -0,0 +1,31 @@
#ifndef API_KEY_DIALOG_H
#define API_KEY_DIALOG_H
#include <QDialog>
class QPushButton;
class QLineEdit;
class QSettings;
class ApiKeyDialog : public QDialog
{
Q_OBJECT
public:
explicit ApiKeyDialog(QWidget *parent = 0);
~ApiKeyDialog();
signals:
public slots:
protected slots:
void enableAccept(const QString & text);
void saveApiKey();
protected:
QPushButton * acceptButton;
QPushButton * cancelButton;
QLineEdit * edit;
QSettings * settings;
};
#endif // API_KEY_DIALOG_H

48
YACReaderLibrary/comic_vine/comic_vine.pri Normal file
View File

@ -0,0 +1,48 @@
HEADERS += \
comic_vine/comic_vine_dialog.h \
comic_vine/comic_vine_client.h \
comic_vine/scraper_lineedit.h \
comic_vine/title_header.h \
comic_vine/series_question.h \
comic_vine/search_single_comic.h \
comic_vine/search_volume.h \
comic_vine/select_comic.h \
comic_vine/select_volume.h \
comic_vine/model/volumes_model.h \
comic_vine/model/comics_model.h \
comic_vine/model/json_model.h \
comic_vine/model/response_parser.h \
comic_vine/scraper_tableview.h \
comic_vine/sort_volume_comics.h \
comic_vine/model/local_comic_list_model.h \
comic_vine/model/volume_comics_model.h \
comic_vine/scraper_scroll_label.h \
comic_vine/scraper_results_paginator.h \
comic_vine/scraper_selector.h \
comic_vine/api_key_dialog.h \
$$PWD/comic_vine_all_volume_comics_retriever.h
SOURCES += \
comic_vine/comic_vine_dialog.cpp \
comic_vine/comic_vine_client.cpp \
comic_vine/scraper_lineedit.cpp \
comic_vine/title_header.cpp \
comic_vine/series_question.cpp \
comic_vine/search_single_comic.cpp \
comic_vine/search_volume.cpp \
comic_vine/select_comic.cpp \
comic_vine/select_volume.cpp \
comic_vine/model/volumes_model.cpp \
comic_vine/model/comics_model.cpp \
comic_vine/model/json_model.cpp \
comic_vine/model/response_parser.cpp \
comic_vine/scraper_tableview.cpp \
comic_vine/sort_volume_comics.cpp \
comic_vine/model/local_comic_list_model.cpp \
comic_vine/model/volume_comics_model.cpp \
comic_vine/scraper_scroll_label.cpp \
comic_vine/scraper_results_paginator.cpp \
comic_vine/scraper_selector.cpp \
comic_vine/api_key_dialog.cpp \
$$PWD/comic_vine_all_volume_comics_retriever.cpp

97
YACReaderLibrary/comic_vine/comic_vine_all_volume_comics_retriever.cpp Normal file
View File

@ -0,0 +1,97 @@
#include "comic_vine_all_volume_comics_retriever.h"
#include "http_worker.h"
#include "response_parser.h"
#include <QtScript>
ComicVineAllVolumeComicsRetriever::ComicVineAllVolumeComicsRetriever(const QString &volumeURLString, QObject *parent)
: QObject(parent), volumeURLString(volumeURLString)
{
}
void ComicVineAllVolumeComicsRetriever::getAllVolumeComics()
{
getAllVolumeComics(0);
}
void ComicVineAllVolumeComicsRetriever::getAllVolumeComics(int range)
{
HttpWorker * search = new HttpWorker(volumeURLString.arg(range));
connect(search,SIGNAL(dataReady(const QByteArray &)),this,SLOT(appendVolumeComicsInfo(const QByteArray &)));
connect(search,SIGNAL(timeout()),this,SIGNAL(timeOut()));
connect(search,SIGNAL(timeout()),this,SIGNAL(finished()));
connect(search,SIGNAL(finished()),search,SLOT(deleteLater()));
search->get();
}
void ComicVineAllVolumeComicsRetriever::appendVolumeComicsInfo(const QByteArray &data)
{
QString json(data);
jsonResponses.append(data);
ResponseParser rp;
rp.loadJSONResponse(json);
qint32 currentPage = rp.getCurrentPage();
qint32 totalPages = rp.getTotalPages();
bool isLastResponse = currentPage == totalPages;
if (!isLastResponse) {
getAllVolumeComics(currentPage * 100);
}
else
{
emit allVolumeComicsInfo(consolidateJSON());
emit finished();
}
}
QString ComicVineAllVolumeComicsRetriever::consolidateJSON()
{
QJsonObject consolidatedJSON;
QJsonArray comicsInfo;
foreach (QByteArray json, jsonResponses) {
QJsonDocument doc = QJsonDocument::fromJson(json);
if(doc.isNull() || !doc.isObject() || doc.isEmpty())
{
continue;
}
QJsonObject main = doc.object();
QJsonValue error = main["error"];
if (error.isUndefined() || error.toString() != "OK")
{
continue;
}
else
{
QJsonValue results = main["results"];
if (results.isUndefined() || !results.isArray())
{
continue;
}
QJsonArray resultsArray = results.toArray();
foreach (const QJsonValue & v, resultsArray)
comicsInfo.append(v);
}
}
consolidatedJSON["error"] = "OK";
consolidatedJSON["status_code"] = 1;
consolidatedJSON["number_of_total_results"] = comicsInfo.size();
consolidatedJSON["offset"] = 0;
consolidatedJSON["results"] = comicsInfo;
QJsonDocument doc(consolidatedJSON);
return doc.toJson(QJsonDocument::Compact);
}

28
YACReaderLibrary/comic_vine/comic_vine_all_volume_comics_retriever.h Normal file
View File

@ -0,0 +1,28 @@
#ifndef COMIC_VINE_ALL_VOLUME_COMICS_RETRIEVER_H
#define COMIC_VINE_ALL_VOLUME_COMICS_RETRIEVER_H
#include <QObject>
class ComicVineAllVolumeComicsRetriever : public QObject
{
Q_OBJECT
public:
explicit ComicVineAllVolumeComicsRetriever(const QString &volumeURLString, QObject *parent = 0);
void getAllVolumeComics();
protected:
void getAllVolumeComics(const int range);
signals:
void allVolumeComicsInfo(QString json);
void finished();
void timeOut();
protected slots:
void appendVolumeComicsInfo(const QByteArray &data);
protected:
QString volumeURLString;
QList<QByteArray> jsonResponses;
QString consolidateJSON();
};
#endif // COMIC_VINE_ALL_VOLUME_COMICS_RETRIEVER_H

Some files were not shown because too many files have changed in this diff Show More