diff --git a/3rdparty/qtiocompressor/CMakeLists.txt b/3rdparty/qtiocompressor/CMakeLists.txt deleted file mode 100644 index 0033c6f48..000000000 --- a/3rdparty/qtiocompressor/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -cmake_minimum_required(VERSION 3.5) - -add_library(qtiocompressor STATIC qtiocompressor.cpp) -target_link_libraries( - qtiocompressor - PUBLIC Qt${QT_VERSION_MAJOR}::Core ZLIB::ZLIB -) diff --git a/3rdparty/qtiocompressor/LGPL_EXCEPTION.txt b/3rdparty/qtiocompressor/LGPL_EXCEPTION.txt deleted file mode 100644 index 238ade519..000000000 --- a/3rdparty/qtiocompressor/LGPL_EXCEPTION.txt +++ /dev/null @@ -1,23 +0,0 @@ -Nokia Qt LGPL Exception version 1.1 - -As an additional permission to the GNU Lesser General Public License -version 2.1, the object code form of a "work that uses the Library" -may incorporate material from a header file that is part of the -Library. You may distribute such object code under terms of your -choice, provided that: -(i) the header files of the Library have not been modified; and -(ii) the incorporated material is limited to numerical parameters, -data structure layouts, accessors, macros, inline functions and -templates; and -(iii) you comply with the terms of Section 6 of the GNU -Lesser General Public License version 2.1. - -Moreover, you may apply this exception to a modified version of the -Library, provided that such modification does not involve copying -material from the Library into the modified Library?s header files -unless such material is limited to (i) numerical parameters; (ii) data -structure layouts; (iii) accessors; and (iv) small macros, templates -and inline functions of five lines or less in length. - -Furthermore, you are not required to apply this additional permission -to a modified version of the Library. diff --git a/3rdparty/qtiocompressor/LICENSE.GPL3 b/3rdparty/qtiocompressor/LICENSE.GPL3 deleted file mode 100644 index 94a9ed024..000000000 --- a/3rdparty/qtiocompressor/LICENSE.GPL3 +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/3rdparty/qtiocompressor/QtIOCompressor b/3rdparty/qtiocompressor/QtIOCompressor deleted file mode 100644 index 350ed4b02..000000000 --- a/3rdparty/qtiocompressor/QtIOCompressor +++ /dev/null @@ -1 +0,0 @@ -#include "qtiocompressor.h" diff --git a/3rdparty/qtiocompressor/qtiocompressor.cpp b/3rdparty/qtiocompressor/qtiocompressor.cpp deleted file mode 100644 index 560202c33..000000000 --- a/3rdparty/qtiocompressor/qtiocompressor.cpp +++ /dev/null @@ -1,624 +0,0 @@ -/**************************************************************************** -** -** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of a Qt Solutions component. -** -** Commercial Usage -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Solutions Commercial License Agreement provided -** with the Software or, alternatively, in accordance with the terms -** contained in a written agreement between you and Nokia. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** Please note Third Party Software included with Qt Solutions may impose -** additional restrictions and it is the user's responsibility to ensure -** that they have met the licensing requirements of the GPL, LGPL, or Qt -** Solutions Commercial license and the relevant license of the Third -** Party Software they are using. -** -** If you are unsure which license is appropriate for your use, please -** contact Nokia at qt-info@nokia.com. -** -****************************************************************************/ - -#include "qtiocompressor.h" -#include "zlib.h" -#include - -typedef Bytef ZlibByte; -typedef uInt ZlibSize; - -class QtIOCompressorPrivate { - QtIOCompressor* q_ptr; - Q_DECLARE_PUBLIC(QtIOCompressor) -public: - enum State { - // Read state - NotReadFirstByte, - InStream, - EndOfStream, - // Write state - NoBytesWritten, - BytesWritten, - // Common - Closed, - Error - }; - - QtIOCompressorPrivate(QtIOCompressor* q_ptr, QIODevice* device, int compressionLevel, int bufferSize); - ~QtIOCompressorPrivate(); - void flushZlib(int flushMode); - bool writeBytes(ZlibByte* buffer, ZlibSize outputSize); - void setZlibError(const QString& erroMessage, int zlibErrorCode); - - QIODevice* device; - bool manageDevice; - z_stream zlibStream; - const int compressionLevel; - const ZlibSize bufferSize; - ZlibByte* buffer; - State state; - QtIOCompressor::StreamFormat streamFormat; -}; - -/*! - \internal -*/ -QtIOCompressorPrivate::QtIOCompressorPrivate(QtIOCompressor* q_ptr, QIODevice* device, int compressionLevel, int bufferSize) - : q_ptr(q_ptr), device(device), compressionLevel(compressionLevel), bufferSize(bufferSize), buffer(new ZlibByte[bufferSize]), state(Closed), streamFormat(QtIOCompressor::ZlibFormat) -{ - // Use default zlib memory management. - zlibStream.zalloc = Z_NULL; - zlibStream.zfree = Z_NULL; - zlibStream.opaque = Z_NULL; -} - -/*! - \internal -*/ -QtIOCompressorPrivate::~QtIOCompressorPrivate() -{ - delete[] buffer; -} - -/*! - \internal - Flushes the zlib stream. -*/ -void QtIOCompressorPrivate::flushZlib(int flushMode) -{ - // No input. - zlibStream.next_in = nullptr; - zlibStream.avail_in = 0; - int status; - do { - zlibStream.next_out = buffer; - zlibStream.avail_out = bufferSize; - status = deflate(&zlibStream, flushMode); - if (status != Z_OK && status != Z_STREAM_END) { - state = QtIOCompressorPrivate::Error; - setZlibError(QT_TRANSLATE_NOOP("QtIOCompressor", "Internal zlib error when compressing: "), status); - return; - } - - ZlibSize outputSize = bufferSize - zlibStream.avail_out; - - // Try to write data from the buffer to to the underlying device, return on failure. - if (!writeBytes(buffer, outputSize)) - return; - - // If the mode is Z_FNISH we must loop until we get Z_STREAM_END, - // else we loop as long as zlib is able to fill the output buffer. - } while ((flushMode == Z_FINISH && status != Z_STREAM_END) || (flushMode != Z_FINISH && zlibStream.avail_out == 0)); - - if (flushMode == Z_FINISH) - Q_ASSERT(status == Z_STREAM_END); - else - Q_ASSERT(status == Z_OK); -} - -/*! - \internal - Writes outputSize bytes from buffer to the inderlying device. -*/ -bool QtIOCompressorPrivate::writeBytes(ZlibByte* buffer, ZlibSize outputSize) -{ - Q_Q(QtIOCompressor); - ZlibSize totalBytesWritten = 0; - // Loop until all bytes are written to the underlying device. - do { - const qint64 bytesWritten = device->write(reinterpret_cast(buffer), outputSize); - if (bytesWritten == -1) { - q->setErrorString(QT_TRANSLATE_NOOP("QtIOCompressor", "Error writing to underlying device: ") + device->errorString()); - return false; - } - totalBytesWritten += bytesWritten; - } while (totalBytesWritten != outputSize); - - // put up a flag so that the device will be flushed on close. - state = BytesWritten; - return true; -} - -/*! - \internal - Sets the error string to errorMessage + zlib error string for zlibErrorCode -*/ -void QtIOCompressorPrivate::setZlibError(const QString& errorMessage, int zlibErrorCode) -{ - Q_Q(QtIOCompressor); - // Watch out, zlibErrorString may be null. - const char* const zlibErrorString = zError(zlibErrorCode); - QString errorString; - if (zlibErrorString) - errorString = errorMessage + zlibErrorString; - else - errorString = errorMessage + " Unknown error, code " + QString::number(zlibErrorCode); - - q->setErrorString(errorString); -} - -/*! \class QtIOCompressor - \brief The QtIOCompressor class is a QIODevice that compresses data streams. - - A QtIOCompressor object is constructed with a pointer to an - underlying QIODevice. Data written to the QtIOCompressor object - will be compressed before it is written to the underlying - QIODevice. Similary, if you read from the QtIOCompressor object, - the data will be read from the underlying device and then - decompressed. - - QtIOCompressor is a sequential device, which means that it does - not support seeks or random access. Internally, QtIOCompressor - uses the zlib library to compress and uncompress data. - - Usage examples: - Writing compressed data to a file: - \code - QFile file("foo"); - QtIOCompressor compressor(&file); - compressor.open(QIODevice::WriteOnly); - compressor.write(QByteArray() << "The quick brown fox"); - compressor.close(); - \endcode - - Reading compressed data from a file: - \code - QFile file("foo"); - QtIOCompressor compressor(&file); - compressor.open(QIODevice::ReadOnly); - const QByteArray text = compressor.readAll(); - compressor.close(); - \endcode - - QtIOCompressor can also read and write compressed data in - different compressed formats, ref. StreamFormat. Use - setStreamFormat() before open() to select format. -*/ - -/*! - \enum QtIOCompressor::StreamFormat - This enum specifies which stream format to use. - - \value ZlibFormat: This is the default and has the smallest overhead. - - \value GzipFormat: This format is compatible with the gzip file - format, but has more overhead than ZlibFormat. Note: requires zlib - version 1.2.x or higher at runtime. - - \value RawZipFormat: This is compatible with the most common - compression method of the data blocks contained in ZIP - archives. Note: ZIP file headers are not read or generated, so - setting this format, by itself, does not let QtIOCompressor read - or write ZIP files. Ref. the ziplist example program. - - \sa setStreamFormat() -*/ - -/*! - Constructs a QtIOCompressor using the given \a device as the underlying device. - - The allowed value range for \a compressionLevel is 0 to 9, where 0 means no compression - and 9 means maximum compression. The default value is 6. - - \a bufferSize specifies the size of the internal buffer used when reading from and writing to the - underlying device. The default value is 65KB. Using a larger value allows for faster compression and - deompression at the expense of memory usage. -*/ -QtIOCompressor::QtIOCompressor(QIODevice* device, int compressionLevel, int bufferSize) - : d_ptr(new QtIOCompressorPrivate(this, device, compressionLevel, bufferSize)) -{} - -/*! - Destroys the QtIOCompressor, closing it if neccesary. -*/ -QtIOCompressor::~QtIOCompressor() -{ - Q_D(QtIOCompressor); - close(); - delete d; -} - -/*! - Sets the format on the compressed stream to \a format. - - \sa QtIOCompressor::StreamFormat -*/ -void QtIOCompressor::setStreamFormat(StreamFormat format) -{ - Q_D(QtIOCompressor); - - // Print a waning if the compile-time version of zlib does not support gzip. - if (format == GzipFormat && checkGzipSupport(ZLIB_VERSION) == false) - qWarning("QtIOCompressor::setStreamFormat: zlib 1.2.x or higher is " - "required to use the gzip format. Current version is: %s", - ZLIB_VERSION); - - d->streamFormat = format; -} - -/*! - Returns the format set on the compressed stream. - \sa QtIOCompressor::StreamFormat -*/ -QtIOCompressor::StreamFormat QtIOCompressor::streamFormat() const -{ - Q_D(const QtIOCompressor); - return d->streamFormat; -} - -/*! - Returns true if the zlib library in use supports the gzip format, false otherwise. -*/ -bool QtIOCompressor::isGzipSupported() -{ - return checkGzipSupport(zlibVersion()); -} - -/*! - \reimp -*/ -bool QtIOCompressor::isSequential() const -{ - return true; -} - -/*! - Opens the QtIOCompressor in \a mode. Only ReadOnly and WriteOnly is supported. - This functon will return false if you try to open in other modes. - - If the underlying device is not opened, this function will open it in a suitable mode. If this happens - the device will also be closed when close() is called. - - If the underlying device is already opened, its openmode must be compatable with \a mode. - - Returns true on success, false on error. - - \sa close() -*/ -bool QtIOCompressor::open(OpenMode mode) -{ - Q_D(QtIOCompressor); - if (isOpen()) { - qWarning("QtIOCompressor::open: device already open"); - return false; - } - - // Check for correct mode: ReadOnly xor WriteOnly - const bool read = (bool)(mode & ReadOnly); - const bool write = (bool)(mode & WriteOnly); - const bool both = (read && write); - const bool neither = !(read || write); - if (both || neither) { - qWarning("QtIOCompressor::open: QtIOCompressor can only be opened in the ReadOnly or WriteOnly modes"); - return false; - } - - // If the underlying device is open, check that is it opened in a compatible mode. - if (d->device->isOpen()) { - d->manageDevice = false; - const OpenMode deviceMode = d->device->openMode(); - if (read && !(deviceMode & ReadOnly)) { - qWarning("QtIOCompressor::open: underlying device must be open in one of the ReadOnly or WriteOnly modes"); - return false; - } - else if (write && !(deviceMode & WriteOnly)) { - qWarning("QtIOCompressor::open: underlying device must be open in one of the ReadOnly or WriteOnly modes"); - return false; - } - - // If the underlying device is closed, open it. - } - else { - d->manageDevice = true; - if (d->device->open(mode) == false) { - setErrorString(QT_TRANSLATE_NOOP("QtIOCompressor", "Error opening underlying device: ") + d->device->errorString()); - return false; - } - } - - // Initialize zlib for deflating or inflating. - - // The second argument to inflate/deflateInit2 is the windowBits parameter, - // which also controls what kind of compression stream headers to use. - // The default value for this is 15. Passing a value greater than 15 - // enables gzip headers and then subtracts 16 form the windowBits value. - // (So passing 31 gives gzip headers and 15 windowBits). Passing a negative - // value selects no headers hand then negates the windowBits argument. - int windowBits; - switch (d->streamFormat) { - case QtIOCompressor::GzipFormat: - windowBits = 31; - break; - case QtIOCompressor::RawZipFormat: - windowBits = -15; - break; - default: - windowBits = 15; - } - - int status; - if (read) { - d->state = QtIOCompressorPrivate::NotReadFirstByte; - d->zlibStream.avail_in = 0; - d->zlibStream.next_in = nullptr; - if (d->streamFormat == QtIOCompressor::ZlibFormat) { - status = inflateInit(&d->zlibStream); - } - else { - if (checkGzipSupport(zlibVersion()) == false) { - setErrorString(QT_TRANSLATE_NOOP("QtIOCompressor::open", "The gzip format not supported in this version of zlib.")); - return false; - } - - status = inflateInit2(&d->zlibStream, windowBits); - } - } - else { - d->state = QtIOCompressorPrivate::NoBytesWritten; - if (d->streamFormat == QtIOCompressor::ZlibFormat) - status = deflateInit(&d->zlibStream, d->compressionLevel); - else - status = deflateInit2(&d->zlibStream, d->compressionLevel, Z_DEFLATED, windowBits, 8, Z_DEFAULT_STRATEGY); - } - - // Handle error. - if (status != Z_OK) { - d->setZlibError(QT_TRANSLATE_NOOP("QtIOCompressor::open", "Internal zlib error: "), status); - return false; - } - return QIODevice::open(mode); -} - -/*! - Closes the QtIOCompressor, and also the underlying device if it was opened by QtIOCompressor. - \sa open() -*/ -void QtIOCompressor::close() -{ - Q_D(QtIOCompressor); - if (isOpen() == false) - return; - - // Flush and close the zlib stream. - if (openMode() & ReadOnly) { - d->state = QtIOCompressorPrivate::NotReadFirstByte; - inflateEnd(&d->zlibStream); - } - else { - if (d->state == QtIOCompressorPrivate::BytesWritten) {// Only flush if we have written anything. - d->state = QtIOCompressorPrivate::NoBytesWritten; - d->flushZlib(Z_FINISH); - } - deflateEnd(&d->zlibStream); - } - - // Close the underlying device if we are managing it. - if (d->manageDevice) - d->device->close(); - - QIODevice::close(); -} - -/*! - Flushes the internal buffer. - - Each time you call flush, all data written to the QtIOCompressor is compressed and written to the - underlying device. Calling this function can reduce the compression ratio. The underlying device - is not flushed. - - Calling this function when QtIOCompressor is in ReadOnly mode has no effect. -*/ -void QtIOCompressor::flush() -{ - Q_D(QtIOCompressor); - if (isOpen() == false || openMode() & ReadOnly) - return; - - d->flushZlib(Z_SYNC_FLUSH); -} - -/*! - Returns 1 if there might be data available for reading, or 0 if there is no data available. - - There is unfortunately no way of knowing how much data there is available when dealing with compressed streams. - - Also, since the remaining compressed data might be a part of the meta-data that ends the compressed stream (and - therefore will yield no uncompressed data), you cannot assume that a read after getting a 1 from this function will return data. -*/ -qint64 QtIOCompressor::bytesAvailable() const -{ - Q_D(const QtIOCompressor); - if ((openMode() & ReadOnly) == false) - return 0; - - int numBytes = 0; - - switch (d->state) { - case QtIOCompressorPrivate::NotReadFirstByte: - numBytes = d->device->bytesAvailable(); - break; - case QtIOCompressorPrivate::InStream: - numBytes = 1; - break; - case QtIOCompressorPrivate::EndOfStream: - case QtIOCompressorPrivate::Error: - default: - numBytes = 0; - break; - }; - - numBytes += QIODevice::bytesAvailable(); - - if (numBytes > 0) - return 1; - else - return 0; -} - -/*! - \internal - Reads and decompresses data from the underlying device. -*/ -qint64 QtIOCompressor::readData(char* data, qint64 maxSize) -{ - Q_D(QtIOCompressor); - - if (d->state == QtIOCompressorPrivate::EndOfStream) - return 0; - - if (d->state == QtIOCompressorPrivate::Error) - return -1; - - // We are ging to try to fill the data buffer - d->zlibStream.next_out = reinterpret_cast(data); - d->zlibStream.avail_out = maxSize; - - int status; - do { - // Read data if if the input buffer is empty. There could be data in the buffer - // from a previous readData call. - if (d->zlibStream.avail_in == 0) { - qint64 bytesAvalible = d->device->read(reinterpret_cast(d->buffer), d->bufferSize); - d->zlibStream.next_in = d->buffer; - d->zlibStream.avail_in = bytesAvalible; - - if (bytesAvalible == -1) { - d->state = QtIOCompressorPrivate::Error; - setErrorString(QT_TRANSLATE_NOOP("QtIOCompressor", "Error reading data from underlying device: ") + d->device->errorString()); - return -1; - } - - if (d->state != QtIOCompressorPrivate::InStream) { - // If we are not in a stream and get 0 bytes, we are probably trying to read from an empty device. - if (bytesAvalible == 0) - return 0; - else if (bytesAvalible > 0) - d->state = QtIOCompressorPrivate::InStream; - } - } - - // Decompress. - status = inflate(&d->zlibStream, Z_SYNC_FLUSH); - switch (status) { - case Z_NEED_DICT: - case Z_DATA_ERROR: - case Z_MEM_ERROR: - d->state = QtIOCompressorPrivate::Error; - d->setZlibError(QT_TRANSLATE_NOOP("QtIOCompressor", "Internal zlib error when decompressing: "), status); - return -1; - case Z_BUF_ERROR:// No more input and zlib can not privide more output - Not an error, we can try to read again when we have more input. - return 0; - break; - } - // Loop util data buffer is full or we reach the end of the input stream. - } while (d->zlibStream.avail_out != 0 && status != Z_STREAM_END); - - if (status == Z_STREAM_END) { - d->state = QtIOCompressorPrivate::EndOfStream; - - // Unget any data left in the read buffer. - for (int i = d->zlibStream.avail_in; i >= 0; --i) - d->device->ungetChar(*reinterpret_cast(d->zlibStream.next_in + i)); - } - - const ZlibSize outputSize = maxSize - d->zlibStream.avail_out; - return outputSize; -} - -/*! - \internal - Compresses and writes data to the underlying device. -*/ -qint64 QtIOCompressor::writeData(const char* data, qint64 maxSize) -{ - if (maxSize < 1) - return 0; - Q_D(QtIOCompressor); - d->zlibStream.next_in = reinterpret_cast(const_cast(data)); - d->zlibStream.avail_in = maxSize; - - if (d->state == QtIOCompressorPrivate::Error) - return -1; - - do { - d->zlibStream.next_out = d->buffer; - d->zlibStream.avail_out = d->bufferSize; - const int status = deflate(&d->zlibStream, Z_NO_FLUSH); - if (status != Z_OK) { - d->state = QtIOCompressorPrivate::Error; - d->setZlibError(QT_TRANSLATE_NOOP("QtIOCompressor", "Internal zlib error when compressing: "), status); - return -1; - } - - ZlibSize outputSize = d->bufferSize - d->zlibStream.avail_out; - - // Try to write data from the buffer to to the underlying device, return -1 on failure. - if (d->writeBytes(d->buffer, outputSize) == false) - return -1; - - } while (d->zlibStream.avail_out == 0);// run until output is not full. - Q_ASSERT(d->zlibStream.avail_in == 0); - - return maxSize; -} - -/* - \internal - Checks if the run-time zlib version is 1.2.x or higher. -*/ -bool QtIOCompressor::checkGzipSupport(const char* const versionString) -{ - if (strlen(versionString) < 3) - return false; - - if (versionString[0] == '0' || (versionString[0] == '1' && (versionString[2] == '0' || versionString[2] == '1'))) - return false; - - return true; -} - -#include "moc_qtiocompressor.cpp" diff --git a/3rdparty/qtiocompressor/qtiocompressor.h b/3rdparty/qtiocompressor/qtiocompressor.h deleted file mode 100644 index 5f2f17567..000000000 --- a/3rdparty/qtiocompressor/qtiocompressor.h +++ /dev/null @@ -1,97 +0,0 @@ -/**************************************************************************** -** -** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of a Qt Solutions component. -** -** Commercial Usage -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Solutions Commercial License Agreement provided -** with the Software or, alternatively, in accordance with the terms -** contained in a written agreement between you and Nokia. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** Please note Third Party Software included with Qt Solutions may impose -** additional restrictions and it is the user's responsibility to ensure -** that they have met the licensing requirements of the GPL, LGPL, or Qt -** Solutions Commercial license and the relevant license of the Third -** Party Software they are using. -** -** If you are unsure which license is appropriate for your use, please -** contact Nokia at qt-info@nokia.com. -** -****************************************************************************/ - -#ifndef QTIOCOMPRESSOR_H -#define QTIOCOMPRESSOR_H - -#include - -#if defined(Q_WS_WIN) -#if !defined(QT_QTIOCOMPRESSOR_EXPORT) && !defined(QT_QTIOCOMPRESSOR_IMPORT) -#define QT_QTIOCOMPRESSOR_EXPORT -#elif defined(QT_QTIOCOMPRESSOR_IMPORT) -#if defined(QT_QTIOCOMPRESSOR_EXPORT) -#undef QT_QTIOCOMPRESSOR_EXPORT -#endif -#define QT_QTIOCOMPRESSOR_EXPORT __declspec(dllimport) -#elif defined(QT_QTIOCOMPRESSOR_EXPORT) -#undef QT_QTIOCOMPRESSOR_EXPORT -#define QT_QTIOCOMPRESSOR_EXPORT __declspec(dllexport) -#endif -#else -#define QT_QTIOCOMPRESSOR_EXPORT -#endif - -class QtIOCompressorPrivate; -class QT_QTIOCOMPRESSOR_EXPORT QtIOCompressor : public QIODevice { - Q_OBJECT -public: - enum StreamFormat { ZlibFormat, - GzipFormat, - RawZipFormat }; - QtIOCompressor(QIODevice* device, int compressionLevel = 6, int bufferSize = 65500); - ~QtIOCompressor() override; - void setStreamFormat(StreamFormat format); - StreamFormat streamFormat() const; - static bool isGzipSupported(); - bool isSequential() const override; - bool open(OpenMode mode) override; - void close() override; - void flush(); - qint64 bytesAvailable() const override; - -protected: - qint64 readData(char* data, qint64 maxSize) override; - qint64 writeData(const char* data, qint64 maxSize) override; - -private: - static bool checkGzipSupport(const char* const versionString); - QtIOCompressorPrivate* d_ptr; - Q_DECLARE_PRIVATE(QtIOCompressor) - Q_DISABLE_COPY(QtIOCompressor) -}; - -#endif diff --git a/CMakeLists.txt b/CMakeLists.txt index 6d2000b1c..1ab8a1d70 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -145,6 +145,10 @@ option( ) option(ENABLE_CATEGORIZED_VIEW "Enable support for categorised view" OFF) option(ENABLE_SCROBBLING "Enable scrobbling" ON) +option(ENABLE_TAGEDITOR_SUPPORT "Enable tag editor support" OFF) +option(ENABLE_TRACKORGANIZER_SUPPORT "Enable track organizer support" OFF) + + if(WIN32 OR APPLE OR HAIKU) option(ENABLE_DEVICES_SUPPORT "Enable suport for external devices" OFF) @@ -260,8 +264,17 @@ if(TagLib_FOUND) endif() endif() - set(ENABLE_TAGEDITOR_SUPPORT 1) - set(ENABLE_TRACKORGANIZER_SUPPORT 1) + if(ENABLE_TAGEDITOR_SUPPORT) + set(ENABLE_TAGEDITOR_SUPPORT 1) + else() + set(ENABLE_TAGEDITOR_SUPPORT 0) + endif() + + if(ENABLE_TRACKORGANIZER_SUPPORT) + set(ENABLE_TRACKORGANIZER_SUPPORT 1) + else() + set(ENABLE_TRACKORGANIZER_SUPPORT 0) + endif() if(ENABLE_FFMPEG) find_package(FFMPEG COMPONENTS avcodec avutil avformat) @@ -612,15 +625,23 @@ endif() target_sources(cantata PRIVATE cantata.qrc cantata_media.qrc) if(TagLib_FOUND) - target_sources( - cantata - PRIVATE - tags/tageditor.cpp - tags/trackorganiser.cpp - devices/filenameschemedialog.cpp - widgets/tagspinbox.cpp - tags/taghelperiface.cpp - ) + if(ENABLE_TAGEDITOR_SUPPORT) + target_sources(cantata PRIVATE + tags/tageditor.cpp + widgets/tagspinbox.cpp + ) + endif() + + if(ENABLE_TRACKORGANIZER_SUPPORT) + target_sources(cantata PRIVATE + tags/trackorganiser.cpp + ) + endif() + + target_sources(cantata PRIVATE + devices/filenameschemedialog.cpp + tags/taghelperiface.cpp + ) # Cantata still links to taglib, even if external tag reader/writer is used, because JamendoService uses taglib for ID3 genres. target_link_libraries(cantata PRIVATE TagLib::TagLib) @@ -640,7 +661,10 @@ if(TagLib_FOUND) set(ENABLE_REPLAYGAIN_SUPPORT 1) add_subdirectory(replaygain) endif() - add_subdirectory(tags) + + if(ENABLE_TAGEDITOR_SUPPORT OR ENABLE_TRACKORGANIZER_SUPPORT) + add_subdirectory(tags) + endif() if(ENABLE_DEVICES_SUPPORT) add_subdirectory(3rdparty/solid-lite) @@ -807,16 +831,24 @@ endif(WIN32) add_subdirectory(translations) add_subdirectory(support) -add_subdirectory(3rdparty/qtiocompressor) add_subdirectory(3rdparty/knotifications) add_subdirectory(streams/icons) add_subdirectory(online/icons) -target_link_libraries(cantata PRIVATE support-core qtiocompressor - KF6Notifications) +find_library(QtSolutions_IOCompressor_LIB QtSolutions_IOCompressor-2.3 PATHS /usr/lib64) +target_link_libraries(cantata PRIVATE support-core KF6Notifications) find_package(KF6ItemViews REQUIRED) +find_package(KF6Archive REQUIRED) +find_package(KF6StatusNotifierItem QUIET) + target_link_libraries(cantata PRIVATE KF6::ItemViews) +target_link_libraries(cantata PRIVATE KF6::Archive) + +if (KF6StatusNotifierItem_FOUND AND UNIX AND NOT APPLE) + target_link_libraries(cantata PRIVATE KF6::StatusNotifierItem) + target_compile_definitions(cantata PRIVATE USE_KSNI) +endif() # enable warnings add_definitions(-DQT_NO_DEBUG_OUTPUT) @@ -842,6 +874,11 @@ if(UNIX AND NOT APPLE) PROGRAMS ${CMAKE_BINARY_DIR}/cantata-remote DESTINATION ${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}/scripts ) +# KNotifications descriptor + install( + FILES data/cantata.notifyrc + DESTINATION ${CMAKE_INSTALL_DATADIR}/knotifications6 + ) install( FILES ${CMAKE_BINARY_DIR}/${PROJECT_REV_ID}.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} diff --git a/context/albumview.cpp b/context/albumview.cpp index c98fd66fd..a814bdbc5 100644 --- a/context/albumview.cpp +++ b/context/albumview.cpp @@ -28,7 +28,6 @@ #include "models/mpdlibrarymodel.h" #include "mpd-interface/cuefile.h" #include "network/networkaccessmanager.h" -#include "qtiocompressor/qtiocompressor.h" #include "support/action.h" #include "support/actioncollection.h" #include "support/configuration.h" @@ -46,7 +45,7 @@ #include const QLatin1String AlbumView::constCacheDir("albums/"); -const QLatin1String AlbumView::constInfoExt(".html.gz"); +const QLatin1String AlbumView::constInfoExt(".html"); static const QLatin1String constScheme("cantata"); @@ -246,11 +245,8 @@ void AlbumView::getDetails() QString cachedFile = cacheFileName(Covers::fixArtist(currentSong.albumArtistOrComposer()), currentSong.album, prefix, false); if (QFile::exists(cachedFile)) { QFile f(cachedFile); - QtIOCompressor compressor(&f); - compressor.setStreamFormat(QtIOCompressor::GzipFormat); - if (compressor.open(QIODevice::ReadOnly)) { - QByteArray data = compressor.readAll(); - + if (f.open(QIODevice::ReadOnly)) { + QByteArray data = f.readAll(); if (!data.isEmpty()) { searchResponse(QString::fromUtf8(data), QString()); Utils::touchFile(cachedFile); @@ -301,11 +297,9 @@ void AlbumView::searchResponse(const QString& resp, const QString& lang) details = engine->translateLinks(resp); if (!lang.isEmpty()) { QFile f(cacheFileName(Covers::fixArtist(currentSong.albumArtistOrComposer()), currentSong.album, lang, true)); - QtIOCompressor compressor(&f); - compressor.setStreamFormat(QtIOCompressor::GzipFormat); - if (compressor.open(QIODevice::WriteOnly)) { - compressor.write(resp.toUtf8().constData()); - } + if (f.open(QIODevice::WriteOnly)) { + f.write(resp.toUtf8().constData()); + } } updateDetails(); } diff --git a/context/artistview.cpp b/context/artistview.cpp index 9530e3938..625a06e56 100644 --- a/context/artistview.cpp +++ b/context/artistview.cpp @@ -27,7 +27,6 @@ #include "gui/covers.h" #include "models/mpdlibrarymodel.h" #include "network/networkaccessmanager.h" -#include "qtiocompressor/qtiocompressor.h" #include "support/action.h" #include "support/actioncollection.h" #include "support/utils.h" @@ -49,7 +48,7 @@ static const char* constNameKey = "name"; const int ArtistView::constCacheAge = 0;// 0 => dont automatically clean cache const QLatin1String ArtistView::constCacheDir("artists/"); -const QLatin1String ArtistView::constInfoExt(".html.gz"); +const QLatin1String ArtistView::constInfoExt(".html"); const QLatin1String ArtistView::constSimilarInfoExt(".txt"); static QString cacheFileName(const QString& artist, const QString& lang, bool similar, bool createDir) @@ -228,11 +227,8 @@ void ArtistView::loadBio() QString cachedFile = cacheFileName(currentSong.artist, prefix, false, false); if (QFile::exists(cachedFile)) { QFile f(cachedFile); - QtIOCompressor compressor(&f); - compressor.setStreamFormat(QtIOCompressor::GzipFormat); - if (compressor.open(QIODevice::ReadOnly)) { - QString data = QString::fromUtf8(compressor.readAll()); - + if (f.open(QIODevice::ReadOnly)) { + QString data = QString::fromUtf8(f.readAll()); if (!data.isEmpty()) { searchResponse(data, QString()); Utils::touchFile(cachedFile); @@ -388,11 +384,9 @@ void ArtistView::searchResponse(const QString& resp, const QString& lang) if (!resp.isEmpty() && !lang.isEmpty()) { QFile f(cacheFileName(currentSong.artist, lang, false, true)); - QtIOCompressor compressor(&f); - compressor.setStreamFormat(QtIOCompressor::GzipFormat); - if (compressor.open(QIODevice::WriteOnly)) { - compressor.write(resp.toUtf8().constData()); - } + if (f.open(QIODevice::WriteOnly)) { + f.write(resp.toUtf8().constData()); + } } loadSimilar(); setBio(); diff --git a/context/songview.cpp b/context/songview.cpp index cd600aaa9..4c00578c4 100644 --- a/context/songview.cpp +++ b/context/songview.cpp @@ -37,7 +37,6 @@ #include "gui/stdactions.h" #include "mpd-interface/mpdstatus.h" #include "network/networkaccessmanager.h" -#include "qtiocompressor/qtiocompressor.h" #include "support/action.h" #include "support/actioncollection.h" #include "support/utils.h" @@ -57,7 +56,7 @@ const QLatin1String SongView::constLyricsDir("lyrics/"); const QLatin1String SongView::constExtension(".lyrics"); const QLatin1String SongView::constCacheDir("tracks/"); -const QLatin1String SongView::constInfoExt(".html.gz"); +const QLatin1String SongView::constInfoExt(".html"); static QString infoCacheFileName(const Song& song, const QString& lang, bool createDir) { @@ -440,11 +439,8 @@ void SongView::loadInfo() QString cachedFile = infoCacheFileName(currentSong, prefix, false); if (QFile::exists(cachedFile)) { QFile f(cachedFile); - QtIOCompressor compressor(&f); - compressor.setStreamFormat(QtIOCompressor::GzipFormat); - if (compressor.open(QIODevice::ReadOnly)) { - QByteArray data = compressor.readAll(); - + if (f.open(QIODevice::ReadOnly)) { + QByteArray data = f.readAll(); if (!data.isEmpty()) { infoSearchResponse(QString::fromUtf8(data), QString()); Utils::touchFile(cachedFile); @@ -684,10 +680,8 @@ void SongView::infoSearchResponse(const QString& resp, const QString& lang) str = engine->translateLinks(resp); if (!lang.isEmpty()) { QFile f(infoCacheFileName(currentSong, lang, true)); - QtIOCompressor compressor(&f); - compressor.setStreamFormat(QtIOCompressor::GzipFormat); - if (compressor.open(QIODevice::WriteOnly)) { - compressor.write(resp.toUtf8().constData()); + if (f.open(QIODevice::WriteOnly)) { + f.write(resp.toUtf8().constData()); } } } diff --git a/context/wikipediasettings.cpp b/context/wikipediasettings.cpp index 7a3c89f1b..a81dbe63a 100644 --- a/context/wikipediasettings.cpp +++ b/context/wikipediasettings.cpp @@ -24,7 +24,6 @@ #include "wikipediasettings.h" #include "gui/settings.h" #include "network/networkaccessmanager.h" -#include "qtiocompressor/qtiocompressor.h" #include "support/action.h" #include "support/icon.h" #include "support/spinner.h" @@ -35,8 +34,8 @@ #include #include -static const QString constOldFileName = QLatin1String("wikipedia-available.xml.gz"); -static const QString constFileName = QLatin1String("languages.xml.gz"); +static const QString constOldFileName = QLatin1String("wikipedia-available.xml"); +static const QString constFileName = QLatin1String("languages.xml"); QString WikipediaSettings::constSubDir = QLatin1String("wikipedia"); @@ -105,10 +104,8 @@ void WikipediaSettings::showEvent(QShowEvent* e) QString fileName = localeFile(); if (QFile::exists(fileName)) { QFile f(fileName); - QtIOCompressor compressor(&f); - compressor.setStreamFormat(QtIOCompressor::GzipFormat); - if (compressor.open(QIODevice::ReadOnly)) { - data = compressor.readAll(); + if (f.open(QIODevice::ReadOnly)) { + data = f.readAll(); } } @@ -190,10 +187,8 @@ void WikipediaSettings::parseLangs() QByteArray data = reply->readAll(); parseLangs(data); QFile f(localeFile()); - QtIOCompressor compressor(&f); - compressor.setStreamFormat(QtIOCompressor::GzipFormat); - if (compressor.open(QIODevice::WriteOnly)) { - compressor.write(data); + if (f.open(QIODevice::WriteOnly)) { + f.write(data); } } diff --git a/devices/fsdevice.cpp b/devices/fsdevice.cpp index cdd985373..70f1da8a8 100644 --- a/devices/fsdevice.cpp +++ b/devices/fsdevice.cpp @@ -731,7 +731,7 @@ QString FsDevice::cacheFileName() const if (audioFolder.isEmpty()) { setAudioFolder(); } - return audioFolder + constCantataCacheFile + ".xml.gz"; + return audioFolder + constCantataCacheFile + ".xml"; } void FsDevice::saveCache() diff --git a/gui/cachesettings.cpp b/gui/cachesettings.cpp index 7965e05cc..7a9c9d9f1 100644 --- a/gui/cachesettings.cpp +++ b/gui/cachesettings.cpp @@ -268,20 +268,12 @@ CacheSettings::CacheSettings(QWidget* parent) << "*.png", tree); new CacheItem(tr("Lyrics"), Utils::cacheDir(SongView::constLyricsDir, false), QStringList() << "*" + SongView::constExtension, tree); - new CacheItem(tr("Artist Information"), Utils::cacheDir(ArtistView::constCacheDir, false), QStringList() << "*" + ArtistView::constInfoExt << "*" + ArtistView::constSimilarInfoExt << "*.json.gz" - << "*.jpg" - << "*.png", - tree); new CacheItem(tr("Album Information"), Utils::cacheDir(AlbumView::constCacheDir, false), QStringList() << "*" + AlbumView::constInfoExt << "*.jpg" << "*.png", tree); new CacheItem(tr("Track Information"), Utils::cacheDir(SongView::constCacheDir, false), QStringList() << "*" + AlbumView::constInfoExt, tree); new CacheItem(tr("Stream Listings"), Utils::cacheDir(StreamsModel::constSubDir, false), QStringList() << "*" + StreamsModel::constCacheExt, tree); new CacheItem(tr("Podcast Directories"), Utils::cacheDir(PodcastSearchDialog::constCacheDir, false), QStringList() << "*" + PodcastSearchDialog::constExt, tree); - new CacheItem(tr("Wikipedia Languages"), Utils::cacheDir(WikipediaSettings::constSubDir, false), QStringList() << "*.xml.gz", tree); -#ifdef ENABLE_SCROBBLING - new CacheItem(tr("Scrobble Tracks"), Utils::cacheDir(Scrobbler::constCacheDir, false), QStringList() << "*.xml.gz", tree); -#endif for (int i = 0; i < tree->topLevelItemCount(); ++i) { connect(static_cast(tree->topLevelItem(i)), SIGNAL(updated()), this, SLOT(updateSpace())); diff --git a/gui/main.cpp b/gui/main.cpp index 9e688fb90..6740b4b88 100644 --- a/gui/main.cpp +++ b/gui/main.cpp @@ -131,10 +131,7 @@ static void removeOldFiles(const QString& d, const QStringList& types) static void removeOldFiles() { // Remove Cantata 1.x XML cache files - removeOldFiles(Utils::cacheDir("library"), QStringList() << "*.xml" - << "*.xml.gz"); - removeOldFiles(Utils::cacheDir("jamendo"), QStringList() << "*.xml.gz"); - removeOldFiles(Utils::cacheDir("magnatune"), QStringList() << "*.xml.gz"); + removeOldFiles(Utils::cacheDir("library"), QStringList() << "*.xml"); } static QString debugAreas() diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp index 869f53538..44eca27c6 100644 --- a/gui/mainwindow.cpp +++ b/gui/mainwindow.cpp @@ -67,9 +67,13 @@ #include "http/httpserver.h" #include "online/onlineservicespage.h" #ifdef TagLib_FOUND +#if ENABLE_TAGEDITOR_SUPPORT #include "tags/tageditor.h" +#endif #include "tags/tags.h" +#if ENABLE_TRACKORGANIZER_SUPPORT #include "tags/trackorganiser.h" +#endif #ifdef ENABLE_REPLAYGAIN_SUPPORT #include "replaygain/rgdialog.h" #endif @@ -1287,21 +1291,24 @@ void MainWindow::expand() bool MainWindow::canShowDialog() { - if (PreferencesDialog::instanceCount() || CoverDialog::instanceCount() -#ifdef TagLib_FOUND - || TagEditor::instanceCount() || TrackOrganiser::instanceCount() +if (PreferencesDialog::instanceCount() || CoverDialog::instanceCount() +#if defined(ENABLE_TAGEDITOR_SUPPORT) && ENABLE_TAGEDITOR_SUPPORT + || TagEditor::instanceCount() +#endif +#if defined(ENABLE_TRACKORGANIZER_SUPPORT) && ENABLE_TRACKORGANIZER_SUPPORT + || TrackOrganiser::instanceCount() #endif #ifdef ENABLE_DEVICES_SUPPORT - || ActionDialog::instanceCount() || SyncDialog::instanceCount() + || ActionDialog::instanceCount() || SyncDialog::instanceCount() #endif #ifdef ENABLE_REPLAYGAIN_SUPPORT - || RgDialog::instanceCount() + || RgDialog::instanceCount() #endif - ) { - MessageBox::error(this, tr("Please close other dialogs first.")); - return false; - } - return true; +) { + MessageBox::error(this, tr("Please close other dialogs first.")); + return false; +} +return true; } void MainWindow::showPreferencesDialog(const QString& page) @@ -1334,10 +1341,20 @@ void MainWindow::quit() } #endif #ifdef TagLib_FOUND - if (TagEditor::instanceCount() || 0 != TrackOrganiser::instanceCount()) { +#if defined(ENABLE_TAGEDITOR_SUPPORT) && ENABLE_TAGEDITOR_SUPPORT + if (TagEditor::instanceCount() +#if defined(ENABLE_TRACKORGANIZER_SUPPORT) && ENABLE_TRACKORGANIZER_SUPPORT + || 0 != TrackOrganiser::instanceCount() +#endif + ) { + return; + } +#elif defined(ENABLE_TRACKORGANIZER_SUPPORT) && ENABLE_TRACKORGANIZER_SUPPORT + if (0 != TrackOrganiser::instanceCount()) { return; } #endif +#endif #ifdef ENABLE_DEVICES_SUPPORT if (ActionDialog::instanceCount() || SyncDialog::instanceCount()) { return; @@ -2146,6 +2163,16 @@ void MainWindow::updateStatus(MPDStatus* const status) } if (status->state() != lastState && (MPDState_Playing == status->state() || MPDState_Stopped == status->state())) { startContextTimer(); +// Queue finished (end of playlist or stop-after-current) + if (status->state() == MPDState_Stopped && + status->nextSongId() == -1 && + Settings::self()->showPopups()) { + auto *n = new KNotification(QStringLiteral("queueFinished")); + n->setTitle(tr("Queue finished")); + n->setText(QString()); + n->setUrgency(KNotification::NormalUrgency); + n->sendEvent(); + } } // Update status info @@ -2672,9 +2699,15 @@ void MainWindow::collapseAll() void MainWindow::editTags() { #ifdef TagLib_FOUND - if (TagEditor::instanceCount() || !canShowDialog()) { - return; - } +#if defined(ENABLE_TAGEDITOR_SUPPORT) && ENABLE_TAGEDITOR_SUPPORT + if (TagEditor::instanceCount()) { + return; + } +#endif +#endif + if (!canShowDialog()) { + return; + } QList songs; bool isPlayQueue = playQueue->hasFocus(); if (isPlayQueue) { @@ -2698,16 +2731,32 @@ void MainWindow::editTags() } #endif MpdLibraryModel::self()->getDetails(artists, albumArtists, composers, albums, genres); - TagEditor* dlg = new TagEditor(this, songs, artists, albumArtists, composers, albums, genres, udi); - dlg->show(); +#if defined(ENABLE_TAGEDITOR_SUPPORT) && ENABLE_TAGEDITOR_SUPPORT +#ifdef TagLib_FOUND + TagEditor* dlg = new TagEditor(this, songs, artists, albumArtists, composers, albums, genres, udi); + dlg->show(); +#endif #endif } void MainWindow::organiseFiles() { #ifdef TagLib_FOUND - if (TrackOrganiser::instanceCount() || !canShowDialog()) { - return; + #if defined(ENABLE_TRACKORGANIZER_SUPPORT) && ENABLE_TRACKORGANIZER_SUPPORT +#ifdef TagLib_FOUND + if (TrackOrganiser::instanceCount() || !canShowDialog()) { + return; + } +#else + if (!canShowDialog()) { + return; + } +#endif +#else + if (!canShowDialog()) { + return; + } +#endif } QList songs; @@ -2726,8 +2775,13 @@ void MainWindow::organiseFiles() } #endif - TrackOrganiser* dlg = new TrackOrganiser(this); - dlg->show(songs, udi); +#if defined(ENABLE_TRACKORGANIZER_SUPPORT) && ENABLE_TRACKORGANIZER_SUPPORT +#ifdef TagLib_FOUND + TrackOrganiser* dlg = new TrackOrganiser(this); + dlg->show(songs, udi); +#endif +#endif + } #endif } diff --git a/gui/trayitem.cpp b/gui/trayitem.cpp index 8514ba008..e26d9fcf2 100644 --- a/gui/trayitem.cpp +++ b/gui/trayitem.cpp @@ -121,11 +121,21 @@ void TrayItem::setup() //if (!QSystemTrayIcon::isSystemTrayAvailable()) { // return; //} - - trayItem = new QSystemTrayIcon(this); - trayItem->installEventFilter(new VolumeSliderEventHandler(this)); - trayItemMenu = new QMenu(nullptr); - trayItemMenu->addAction(StdActions::self()->prevTrackAction); + // Create tray backend +#if defined(USE_KSNI) + trayItem = new KStatusNotifierItem(this); + trayItem->setCategory(KStatusNotifierItem::ApplicationStatus); + trayItem->setStatus(KStatusNotifierItem::Active); + trayItemMenu = new QMenu(nullptr); + trayItem->setContextMenu(trayItemMenu); +#else + trayItem = new QSystemTrayIcon(this); + trayItem->installEventFilter(new VolumeSliderEventHandler(this)); + trayItemMenu = new QMenu(nullptr); + trayItem->setContextMenu(trayItemMenu); +#endif + // Populate common menu + trayItemMenu->addAction(StdActions::self()->prevTrackAction); trayItemMenu->addAction(StdActions::self()->playPauseTrackAction); trayItemMenu->addAction(StdActions::self()->stopPlaybackAction); trayItemMenu->addAction(StdActions::self()->stopAfterCurrentTrackAction); @@ -162,12 +172,32 @@ void TrayItem::setup() icon.addFile(QLatin1String(ICON_INSTALL_PREFIX "/scalable/apps/" PROJECT_REV_ID ".svg")); } #endif - trayItem->setIcon(icon); - trayItem->setToolTip(tr("Cantata")); - trayItem->show(); - connect(trayItem, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(trayItemClicked(QSystemTrayIcon::ActivationReason))); + + trayItem->setIcon(icon); +#if defined(USE_KSNI) + trayItem->setToolTip(QIcon::fromTheme(QStringLiteral(PROJECT_REV_ID)), tr("Cantata"), QString()); + // KStatusNotifierItem does not need show() or QSystemTrayIcon connections +#else + trayItem->setToolTip(tr("Cantata")); + trayItem->show(); + connect(trayItem, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), + this, SLOT(trayItemClicked(QSystemTrayIcon::ActivationReason))); #endif + +#endif +} + +#if defined(USE_KSNI) +void TrayItem::setOverlayPaused(bool paused) +{ + if (!trayItem) return; + if (paused) { + trayItem->setOverlayIconByName(QStringLiteral("media-playback-pause")); + } else { + trayItem->setOverlayIcon(QIcon()); // clear overlay + } } +#endif void TrayItem::trayItemClicked(QSystemTrayIcon::ActivationReason reason) { @@ -194,22 +224,55 @@ void TrayItem::trayItemClicked(QSystemTrayIcon::ActivationReason reason) void TrayItem::songChanged(const Song& song, bool isPlaying) { - if (Settings::self()->showPopups()) { bool useable = song.isStandardStream() ? !song.title.isEmpty() && !song.name().isEmpty() : !song.title.isEmpty() && !song.artist.isEmpty() && !song.album.isEmpty(); if (useable && isPlaying) { - if (songNotif == nullptr) { - songNotif = new KNotification("newSong"); - songNotif->setAutoDelete(false); - } - songNotif->setTitle(song.mainText()); - songNotif->setText(song.subText()); - songNotif->setImage(CurrentCover::self()->image().scaledToHeight(512, Qt::SmoothTransformation)); - songNotif->setUrgency(KNotification::LowUrgency); - songNotif->sendEvent(); - } + // Always emit a KDE notification: Plasma can suppress popups but still keep history. + auto *n = new KNotification(QStringLiteral("newSong")); + // Ensure it maps to cantata.notifyrc (safer for per‑app settings/history) + n->setComponentName(QStringLiteral("cantata")); + n->setTitle(song.mainText()); + n->setText(song.subText()); + n->setImage(CurrentCover::self()->image().scaledToHeight(512, Qt::SmoothTransformation)); + n->setUrgency(KNotification::LowUrgency); + n->sendEvent(); + + #if defined(USE_KSNI) +// Multi-line tooltip + overlay (Linux SNI) + const QString title = song.isStandardStream() + ? song.name() + : QStringLiteral("%1 — %2").arg(song.artist, song.title); + + Bad exit status from /var/tmp/rpm-tmp.n4Appy (%build) + const QString sub = song.isStandardStream() + ? song.title + : song.album; + setToolTip(QStringLiteral("audio-x-generic"), title, sub); + setOverlayPaused(!isPlaying); + #else +// Single-line tooltip fallback (Windows/macOS or Linux without SNI) + const QString oneLine = song.isStandardStream() + ? QStringLiteral("%1 — %2").arg(song.name(), song.title) + : QStringLiteral("%1 — %2").arg(song.artist, song.title); + setToolTip(QString(), oneLine, QString()); + #endif } + +#if defined(USE_KSNI) + const QString title = song.isStandardStream() + ? song.name() + : QStringLiteral("%1 — %2").arg(song.artist, song.title); + const QString sub = song.isStandardStream() ? song.title : song.album; + setToolTip(QStringLiteral("audio-x-generic"), title, sub); + setOverlayPaused(!isPlaying); +#else + const QString oneLine = song.isStandardStream() + ? QStringLiteral("%1 — %2").arg(song.name(), song.title) + : QStringLiteral("%1 — %2").arg(song.artist, song.title); + setToolTip(QString(), oneLine, QString()); +#endif + } #ifndef Q_OS_MAC diff --git a/gui/trayitem.h b/gui/trayitem.h index 0e4ddcd73..98da8dde8 100644 --- a/gui/trayitem.h +++ b/gui/trayitem.h @@ -28,6 +28,10 @@ #include "support/icon.h" #include #include +#if defined(USE_KSNI) +#include +#endif + class QMenu; #include "config.h" @@ -49,40 +53,54 @@ class TrayItem : public QObject { void setToolTip(const QString&, const QString&, const QString&) {} #else bool isActive() const { return nullptr != trayItem; } - void setIcon(const QIcon& icon) - { - if (trayItem) { - trayItem->setIcon(icon); - } - } - void setToolTip(const QString& iconName, const QString& title, const QString& subTitle) - { - if (trayItem) { - Q_UNUSED(iconName) - Q_UNUSED(subTitle) - trayItem->setToolTip(title); - } - } + + void setIcon(const QIcon& icon) + { +#if defined(USE_KSNI) + if (trayItem) trayItem->setIcon(icon); +#else + if (trayItem) trayItem->setIcon(icon); +#endif + } + void setToolTip(const QString& iconName, const QString& title, const QString& subTitle) + { + if (!trayItem) return; +#if defined(USE_KSNI) + Q_UNUSED(subTitle) // body comes from separate call below if needed + trayItem->setToolTip(QIcon::fromTheme(iconName), title, QString()); +#else + Q_UNUSED(iconName) + Q_UNUSED(subTitle) + trayItem->setToolTip(title); +#endif + } #endif void songChanged(const Song& song, bool isPlaying); void updateConnections(); void updatePartitions(); void updateOutputs(); +#if defined(USE_KSNI) + void setOverlayPaused(bool paused); +#endif + private Q_SLOTS: void trayItemClicked(QSystemTrayIcon::ActivationReason reason); private: #ifndef Q_OS_MAC - - MainWindow* mw; - QSystemTrayIcon* trayItem; - QMenu* trayItemMenu; - Action* connectionsAction; - Action* partitionsAction; - Action* outputsAction; - + MainWindow* mw; +#if defined(USE_KSNI) + KStatusNotifierItem* trayItem = nullptr; +#else + QSystemTrayIcon* trayItem = nullptr; +#endif + QMenu* trayItemMenu = nullptr; + Action* connectionsAction = nullptr; + Action* partitionsAction = nullptr; + Action* outputsAction = nullptr; #endif + KNotification* songNotif = nullptr; }; diff --git a/models/musiclibraryitemroot.cpp b/models/musiclibraryitemroot.cpp index 791bdb673..0fdad7d3f 100644 --- a/models/musiclibraryitemroot.cpp +++ b/models/musiclibraryitemroot.cpp @@ -31,7 +31,6 @@ #include "musiclibraryitemartist.h" #include "musiclibraryitemsong.h" #include "musiclibrarymodel.h" -#include "qtiocompressor/qtiocompressor.h" #include #include #include @@ -191,17 +190,17 @@ void MusicLibraryItemRoot::toXML(const QString& filename, MusicLibraryProgressMo return; } + QFile file(filename); - QtIOCompressor compressor(&file); - compressor.setStreamFormat(QtIOCompressor::GzipFormat); - if (!compressor.open(QIODevice::WriteOnly)) { + if (!file.open(QIODevice::WriteOnly)) { return; } - QXmlStreamWriter writer(&compressor); + QXmlStreamWriter writer(&file); toXML(writer, prog); - compressor.close(); -} + file.close(); + } + static const quint32 constVersion = 1; static const QString constTopTag = QLatin1String("tagcache"); @@ -353,19 +352,18 @@ bool MusicLibraryItemRoot::fromXML(const QString& filename, const QString& baseF #endif QFile file(filename); - QtIOCompressor compressor(&file); - compressor.setStreamFormat(QtIOCompressor::GzipFormat); - if (!compressor.open(QIODevice::ReadOnly)) { + if (!file.open(QIODevice::ReadOnly)) { return false; } - QXmlStreamReader reader(&compressor); + QXmlStreamReader reader(&file); bool rv = fromXML(reader, baseFolder, prog, em); - compressor.close(); -#ifdef TIME_XML_FILE_LOADING + file.close(); + #ifdef TIME_XML_FILE_LOADING qWarning() << filename << timer.elapsed(); -#endif + #endif return rv; -} + } + bool MusicLibraryItemRoot::fromXML(QXmlStreamReader& reader, const QString& baseFolder, MusicLibraryProgressMonitor* prog, MusicLibraryErrorMonitor* em) { diff --git a/models/streamsmodel.cpp b/models/streamsmodel.cpp index 625e61921..c351172b8 100644 --- a/models/streamsmodel.cpp +++ b/models/streamsmodel.cpp @@ -29,7 +29,6 @@ #include "mpd-interface/mpdparseutils.h" #include "network/networkaccessmanager.h" #include "playqueuemodel.h" -#include "qtiocompressor/qtiocompressor.h" #include "roles.h" #include "support/action.h" #include "support/actioncollection.h" @@ -63,10 +62,10 @@ GLOBAL_STATIC(StreamsModel, instance) const QString StreamsModel::constSubDir = QLatin1String("streams"); -const QString StreamsModel::constCacheExt = QLatin1String(".xml.gz"); +const QString StreamsModel::constCacheExt = QLatin1String(".xml"); const QString StreamsModel::constShoutCastHost = QLatin1String("api.shoutcast.com"); const QString StreamsModel::constCommunityHost = QLatin1String("all.api.radio-browser.info"); -const QString StreamsModel::constCompressedXmlFile = QLatin1String("streams.xml.gz"); +const QString StreamsModel::constCompressedXmlFile = QLatin1String("streams.xml"); const QString StreamsModel::constXmlFile = QLatin1String("streams.xml"); const QString StreamsModel::constSettingsFile = QLatin1String("settings.json"); const QString StreamsModel::constPngIcon = QLatin1String("icon.png"); @@ -155,10 +154,8 @@ void StreamsModel::CategoryItem::saveBookmarks() if (cat->isBookmarks) { if (cat->children.count()) { QFile file(categoryBookmarksName(bookmarksName, true)); - QtIOCompressor compressor(&file); - compressor.setStreamFormat(QtIOCompressor::GzipFormat); - if (compressor.open(QIODevice::WriteOnly)) { - QXmlStreamWriter doc(&compressor); + if (file.open(QIODevice::WriteOnly)) { + QXmlStreamWriter doc(&file); doc.writeStartDocument(); doc.writeStartElement("bookmarks"); doc.writeAttribute("version", "1.0"); @@ -192,10 +189,8 @@ QList StreamsModel::CategoryItem::loadBookmarks() } QFile file(fileName); - QtIOCompressor compressor(&file); - compressor.setStreamFormat(QtIOCompressor::GzipFormat); - if (compressor.open(QIODevice::ReadOnly)) { - QXmlStreamReader doc(&compressor); + if (file.open(QIODevice::ReadOnly)) { + QXmlStreamReader doc(&file); while (!doc.atEnd()) { doc.readNext(); @@ -287,14 +282,10 @@ bool StreamsModel::CategoryItem::saveXml(const QString& fileName, bool format) c QFile file(fileName); - if (fileName.endsWith(".xml")) { - return file.open(QIODevice::WriteOnly) && saveXml(&file, format); - } - else { - QtIOCompressor compressor(&file); - compressor.setStreamFormat(QtIOCompressor::GzipFormat); - return compressor.open(QIODevice::WriteOnly) && saveXml(&compressor, format); + if (!file.open(QIODevice::WriteOnly)) { + return false; } +return saveXml(&file, format); } static void saveStream(QXmlStreamWriter& doc, const StreamsModel::Item* item) @@ -359,20 +350,7 @@ QList StreamsModel::CategoryItem::loadXml(const QString& fi if (!file.open(QIODevice::ReadOnly)) { return QList(); } - // Check for gzip header... - QByteArray header = file.read(2); - bool isCompressed = ((unsigned char)header[0]) == 0x1f && ((unsigned char)header[1]) == 0x8b; - file.seek(0); - - QtIOCompressor compressor(&file); - if (isCompressed) { - compressor.setStreamFormat(QtIOCompressor::GzipFormat); - if (!compressor.open(QIODevice::ReadOnly)) { - return QList(); - } - } - - return loadXml(isCompressed ? (QIODevice*)&compressor : (QIODevice*)&file); + return loadXml(&file); } QList StreamsModel::CategoryItem::loadXml(QIODevice* dev) @@ -456,9 +434,8 @@ QList StreamsModel::FavouritesCategoryItem::loadXml(QIODevi return newItems; } -void StreamsModel::IceCastCategoryItem::addHeaders(QNetworkRequest& req) +void StreamsModel::IceCastCategoryItem::addHeaders(QNetworkRequest& /*req*/) { - req.setRawHeader("Accept-Encoding", "gzip"); } void StreamsModel::ShoutCastCategoryItem::addHeaders(QNetworkRequest& req) @@ -1289,25 +1266,9 @@ static void trimGenres(QMap>& genres) QList StreamsModel::parseIceCastResponse(QIODevice* dev, CategoryItem* cat) { - bool isGZipped = true; - QNetworkReply* nr = qobject_cast(dev); - if (nr) { - const auto hdr = nr->rawHeader("Content-Type"); - if ("application/xml" == hdr) { - isGZipped = false; - } - } - QList newItems; - QtIOCompressor* compressor = nullptr; - QIODevice* readDev = dev; - - if (isGZipped) { - compressor = new QtIOCompressor(dev); - compressor->setStreamFormat(QtIOCompressor::GzipFormat); - compressor->open(QIODevice::ReadOnly); - readDev = compressor; - } - QXmlStreamReader doc(readDev); + QList newItems; + QIODevice* readDev = dev; + QXmlStreamReader doc(readDev); QSet names; QMap> genres; while (!doc.atEnd()) { @@ -1359,7 +1320,6 @@ QList StreamsModel::parseIceCastResponse(QIODevice* dev, Ca newItems.append(genre); } - delete compressor; return newItems; } diff --git a/online/magnatuneservice.cpp b/online/magnatuneservice.cpp index c0d7efe55..986a8e318 100644 --- a/online/magnatuneservice.cpp +++ b/online/magnatuneservice.cpp @@ -29,6 +29,7 @@ #include "support/icon.h" #include #include +#include int MagnatuneXmlParser::parse(QXmlStreamReader& xml) { diff --git a/online/onlinedbservice.cpp b/online/onlinedbservice.cpp index 1ba8a0c8f..367ad8640 100644 --- a/online/onlinedbservice.cpp +++ b/online/onlinedbservice.cpp @@ -26,8 +26,9 @@ #include "gui/covers.h" #include "models/roles.h" #include "network/networkaccessmanager.h" -#include "qtiocompressor/qtiocompressor.h" +#include #include +#include OnlineXmlParser::OnlineXmlParser() { @@ -48,26 +49,35 @@ void OnlineXmlParser::start(NetworkJob* job) void OnlineXmlParser::doParsing(NetworkJob* job) { - QtIOCompressor comp(job->actualJob()); - comp.setStreamFormat(QtIOCompressor::GzipFormat); - if (comp.open(QIODevice::ReadOnly)) { - QXmlStreamReader reader; - reader.setDevice(&comp); - emit startUpdate(); - int artistCount = parse(reader); - if (artistCount > 0) { - emit endUpdate(); - emit stats(artistCount); - } - else { - emit error(tr("Failed to parse")); - emit abortUpdate(); - } - } - else { - emit error(tr("Failed to parse")); - } - emit complete(); + QByteArray compressed = job->actualJob()->readAll(); + + QBuffer buffer(&compressed); + buffer.open(QIODevice::ReadOnly); + + KCompressionDevice dev(&buffer, false, KCompressionDevice::GZip); + if (!dev.open(QIODevice::ReadOnly)) { + emit error(tr("Failed to decompress")); + emit abortUpdate(); + emit complete(); + return; + } + + QByteArray decompressed = dev.readAll(); + QXmlStreamReader reader(decompressed); + + emit startUpdate(); + + int artistCount = parse(reader); + + if (artistCount > 0) { + emit endUpdate(); + emit stats(artistCount); + } else { + emit error(tr("Failed to parse")); + emit abortUpdate(); + } + + emit complete(); } OnlineDbService::OnlineDbService(LibraryDb* d, QObject* p) diff --git a/online/onlineservicespage.cpp b/online/onlineservicespage.cpp index 4301d8849..b63711918 100644 --- a/online/onlineservicespage.cpp +++ b/online/onlineservicespage.cpp @@ -38,9 +38,11 @@ OnlineServicesPage::OnlineServicesPage(QWidget* p) { addPage(StreamsModel::self()->name(), StreamsModel::self()->icon(), StreamsModel::self()->title(), StreamsModel::self()->descr(), new StreamsPage(this)); - JamendoService* jamendo = new JamendoService(this); - addPage(jamendo->name(), jamendo->icon(), jamendo->title(), jamendo->descr(), new OnlineDbWidget(jamendo, this)); - connect(jamendo, SIGNAL(error(QString)), this, SIGNAL(error(QString))); +// Start hide service +// JamendoService* jamendo = new JamendoService(this); +// addPage(jamendo->name(), jamendo->icon(), jamendo->title(), jamendo->descr(), new OnlineDbWidget(jamendo, this)); +// connect(jamendo, SIGNAL(error(QString)), this, SIGNAL(error(QString))); +// End hide service MagnatuneService* magnatune = new MagnatuneService(this); addPage(magnatune->name(), magnatune->icon(), magnatune->title(), magnatune->descr(), new OnlineDbWidget(magnatune, this)); diff --git a/online/podcast_directories.xml b/online/podcast_directories.xml index 9021aabf5..ac6956a31 100644 --- a/online/podcast_directories.xml +++ b/online/podcast_directories.xml @@ -1,6 +1,6 @@ - + diff --git a/online/podcastsearchdialog.cpp b/online/podcastsearchdialog.cpp index 639058bd4..4e4a889c7 100644 --- a/online/podcastsearchdialog.cpp +++ b/online/podcastsearchdialog.cpp @@ -627,13 +627,15 @@ PodcastSearchDialog::PodcastSearchDialog(PodcastService* s, QWidget* parent) pageWidget->addPage(urlPage, tr("Enter URL"), urlPage->icon(), tr("Manual podcast URL")); pages << urlPage; - ITunesSearchPage* itunes = new ITunesSearchPage(pageWidget); - pageWidget->addPage(itunes, tr("Search %1").arg(itunes->name()), itunes->icon(), tr("Search for podcasts on %1").arg(itunes->name())); - pages << itunes; - - GPodderSearchPage* gpodder = new GPodderSearchPage(pageWidget); - pageWidget->addPage(gpodder, tr("Search %1").arg(gpodder->name()), gpodder->icon(), tr("Search for podcasts on %1").arg(gpodder->name())); - pages << gpodder; +// Start hide service +// ITunesSearchPage* itunes = new ITunesSearchPage(pageWidget); +// pageWidget->addPage(itunes, tr("Search %1").arg(itunes->name()), itunes->icon(), tr("Search for podcasts on %1").arg(itunes->name())); +// pages << itunes; +// +// GPodderSearchPage* gpodder = new GPodderSearchPage(pageWidget); +// pageWidget->addPage(gpodder, tr("Search %1").arg(gpodder->name()), gpodder->icon(), tr("Search for podcasts on %1").arg(gpodder->name())); +// pages << gpodder; +// End hide service QSet loaded; pages << loadDirectories(Utils::dataDir(), false, loaded); diff --git a/online/podcastservice.cpp b/online/podcastservice.cpp index c9304f12c..8688cbacb 100644 --- a/online/podcastservice.cpp +++ b/online/podcastservice.cpp @@ -31,7 +31,6 @@ #include "mpd-interface/mpdconnection.h" #include "network/networkaccessmanager.h" #include "podcastsettingsdialog.h" -#include "qtiocompressor/qtiocompressor.h" #include "rssparser.h" #include "support/globalstatic.h" #include "support/utils.h" @@ -55,7 +54,6 @@ GLOBAL_STATIC(PodcastService, instance) static QString encodeName(const QString& name) { QString n = name; - n = n.replace("/", "_"); n = n.replace("\\", "_"); n = n.replace(":", "_"); return n; @@ -137,7 +135,7 @@ bool PodcastService::Proxy::filterAcceptsRow(int sourceRow, const QModelIndex& s } const QLatin1String PodcastService::constName("podcasts"); -static const QLatin1String constExt(".xml.gz"); +static const QLatin1String constExt(".xml"); static const char* constNewFeedProperty = "new-feed"; static const char* constRssUrlProperty = "rss-url"; static const char* constDestProperty = "dest"; @@ -251,14 +249,11 @@ bool PodcastService::Podcast::load() } QFile file(fileName); - QtIOCompressor compressor(&file); - compressor.setStreamFormat(QtIOCompressor::GzipFormat); - if (!compressor.open(QIODevice::ReadOnly)) { + if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { return false; } - QXmlStreamReader reader(&compressor); - unplayedCount = 0; + QXmlStreamReader reader(&file); QString podPath = Settings::self()->podcastDownloadPath(); while (!reader.atEnd()) { @@ -319,13 +314,11 @@ bool PodcastService::Podcast::save() const } QFile file(fileName); - QtIOCompressor compressor(&file); - compressor.setStreamFormat(QtIOCompressor::GzipFormat); - if (!compressor.open(QIODevice::WriteOnly)) { - return false; + if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) { + return false; } - QXmlStreamWriter writer(&compressor); + QXmlStreamWriter writer(&file); writer.writeStartElement(constTopTag); writer.writeAttribute(constImageAttribute, imageUrl.toString());// ?? writer.writeAttribute(constRssAttribute, url.toString()); // ?? @@ -351,7 +344,6 @@ bool PodcastService::Podcast::save() const writer.writeEndElement(); } writer.writeEndElement(); - compressor.close(); return true; } diff --git a/scrobbling/scrobbler.cpp b/scrobbling/scrobbler.cpp index be17d5616..8fd6be27c 100644 --- a/scrobbling/scrobbler.cpp +++ b/scrobbling/scrobbler.cpp @@ -31,7 +31,6 @@ #include "mpd-interface/mpdconnection.h" #include "network/networkaccessmanager.h" #include "pausabletimer.h" -#include "qtiocompressor/qtiocompressor.h" #include "support/configuration.h" #include "support/globalstatic.h" #include "support/utils.h" @@ -57,7 +56,7 @@ void Scrobbler::enableDebug() } const QLatin1String Scrobbler::constCacheDir("scrobbling"); -const QLatin1String Scrobbler::constCacheFile("tracks.xml.gz"); +const QLatin1String Scrobbler::constCacheFile("tracks.xml"); static const QLatin1String constSettingsGroup("Scrobbling"); static const QString constSecretKey = QLatin1String("0753a75ccded9b17b872744d4bb60b35"); static const int constMaxBatchSize = 50; @@ -700,10 +699,8 @@ void Scrobbler::loadCache() return; } QFile file(fileName); - QtIOCompressor compressor(&file); - compressor.setStreamFormat(QtIOCompressor::GzipFormat); - if (compressor.open(QIODevice::ReadOnly)) { - QXmlStreamReader reader(&compressor); + if (file.open(QIODevice::ReadOnly)) { + QXmlStreamReader reader(&file); while (!reader.atEnd()) { reader.readNext(); if (reader.isStartElement() && QLatin1String("track") == reader.name()) { @@ -738,10 +735,8 @@ void Scrobbler::saveCache() } QFile file(fileName); - QtIOCompressor compressor(&file); - compressor.setStreamFormat(QtIOCompressor::GzipFormat); - if (compressor.open(QIODevice::WriteOnly)) { - QXmlStreamWriter writer(&compressor); + if (file.open(QIODevice::WriteOnly)) { + QXmlStreamWriter writer(&file); writer.setAutoFormatting(false); writer.writeStartDocument(); writer.writeStartElement("tracks"); diff --git a/streams/streamspage.cpp b/streams/streamspage.cpp index efa87466d..b54578b4a 100644 --- a/streams/streamspage.cpp +++ b/streams/streamspage.cpp @@ -204,7 +204,7 @@ void StreamsBrowsePage::itemDoubleClicked(const QModelIndex& index) void StreamsBrowsePage::importXml() { QString fileName = QFileDialog::getOpenFileName(this, tr("Import Streams"), QDir::homePath(), - tr("XML Streams (*.xml *.xml.gz *.cantata)")); + tr("XML Streams (*.xml *.xml *.cantata)")); if (fileName.isEmpty()) { return; @@ -214,8 +214,8 @@ void StreamsBrowsePage::importXml() void StreamsBrowsePage::exportXml() { - QLatin1String ext(".xml.gz"); - QString fileName = QFileDialog::getSaveFileName(this, tr("Export Streams"), QDir::homePath() + QLatin1String("/streams") + ext, tr("XML Streams (*.xml.gz)")); + QLatin1String ext(".xml"); + QString fileName = QFileDialog::getSaveFileName(this, tr("Export Streams"), QDir::homePath() + QLatin1String("/streams") + ext, tr("XML Streams (*.xml)")); if (fileName.isEmpty()) { return; diff --git a/support/QtAwesome.cpp b/support/QtAwesome.cpp index bb29f8e4e..bd1abd669 100644 --- a/support/QtAwesome.cpp +++ b/support/QtAwesome.cpp @@ -28,7 +28,7 @@ #endif // Initializing namespaces need to happen outside a namespace -static void qtawesome_init_resources() +[[maybe_unused]] static void qtawesome_init_resources() { Q_INIT_RESOURCE(QtAwesomeFree); } @@ -431,20 +431,15 @@ void QtAwesome::give(const QString& name, QtAwesomeIconPainter* painter) /// /// QLabel* label = new QLabel(QChar( icon_group )); /// label->setFont(awesome->font(style::fas, 16)) - QFont QtAwesome::font(int style, int size) const { - if (!_fontDetails.contains(style)) return QFont(); - - QFont font(_fontDetails[style].fontFamily()); - font.setPixelSize(size); - font.setWeight(_fontDetails[style].fontWeight()); + if (!_fontDetails.contains(style)) return QFont(); - if (style == fa::fa_solid) { - font.setStyleName("Solid"); // <-- This is the fix - } + QFont font(_fontDetails[style].fontFamily()); + font.setPixelSize(size); + font.setWeight(_fontDetails[style].fontWeight()); - return font; + return font; } QString QtAwesome::fontName(int style) const diff --git a/translations/blank.ts b/translations/blank.ts index 99fffd7e6..75581ad0a 100644 --- a/translations/blank.ts +++ b/translations/blank.ts @@ -7865,7 +7865,7 @@ Overwrite? - XML Streams (*.xml *.xml.gz *.cantata) + XML Streams (*.xml * *.cantata) @@ -7875,7 +7875,7 @@ Overwrite? - XML Streams (*.xml.gz) + XML Streams (*) diff --git a/translations/cantata_cs.ts b/translations/cantata_cs.ts index c43299cf9..ad9bbdf74 100644 --- a/translations/cantata_cs.ts +++ b/translations/cantata_cs.ts @@ -5612,16 +5612,16 @@ i18n: ectx: property (text), widget (UrlNoteLabel, ratingsNote) Zavést proudy - XML Streams (*.xml *.xml.gz *.cantata) - Proudy XML (*.xml *.xml.gz *.cantata) + XML Streams (*.xml * *.cantata) + Proudy XML (*.xml * *.cantata) Export Streams Vyvést proudy - XML Streams (*.xml.gz) - Proudy XML (*.xml.gz) + XML Streams (*) + Proudy XML (*) Failed to create '%1'! @@ -14462,8 +14462,8 @@ Přepsat? - XML Streams (*.xml *.xml.gz *.cantata) - Vysílání XML (*.xml *.xml.gz *.cantata) + XML Streams (*.xml * *.cantata) + Vysílání XML (*.xml * *.cantata) @@ -14472,8 +14472,8 @@ Přepsat? - XML Streams (*.xml.gz) - Vysílání XML (*.xml.gz) + XML Streams (*) + Vysílání XML (*) diff --git a/translations/cantata_da.ts b/translations/cantata_da.ts index 9a39a1867..647d1593d 100644 --- a/translations/cantata_da.ts +++ b/translations/cantata_da.ts @@ -7946,8 +7946,8 @@ Overskriv? - XML Streams (*.xml *.xml.gz *.cantata) - XML-strømme (*.xml *.xml.gz *.cantata) + XML Streams (*.xml * *.cantata) + XML-strømme (*.xml * *.cantata) @@ -7956,8 +7956,8 @@ Overskriv? - XML Streams (*.xml.gz) - XML-strømme (*.xml.gz) + XML Streams (*) + XML-strømme (*) diff --git a/translations/cantata_de.ts b/translations/cantata_de.ts index 0127b0627..181a56b2a 100644 --- a/translations/cantata_de.ts +++ b/translations/cantata_de.ts @@ -3483,8 +3483,8 @@ i18n: ectx: property (text), widget (QTreeWidget, files) Stream importieren - XML Streams (*.xml *.xml.gz *.cantata) - XML-Streams (*.xml *.xml.gz *.cantata) + XML Streams (*.xml * *.cantata) + XML-Streams (*.xml * *.cantata) Export Streams @@ -12028,8 +12028,8 @@ Overwrite? - XML Streams (*.xml *.xml.gz *.cantata) - XML-Streams (*.xml *.xml.gz *.cantata) + XML Streams (*.xml * *.cantata) + XML-Streams (*.xml * *.cantata) @@ -12038,8 +12038,8 @@ Overwrite? - XML Streams (*.xml.gz) - XML-Streams (*.xml.gz) + XML Streams (*) + XML-Streams (*) diff --git a/translations/cantata_en_GB.ts b/translations/cantata_en_GB.ts index aaf6616d3..ee9b66acb 100644 --- a/translations/cantata_en_GB.ts +++ b/translations/cantata_en_GB.ts @@ -7983,7 +7983,7 @@ Overwrite? - XML Streams (*.xml *.xml.gz *.cantata) + XML Streams (*.xml * *.cantata) @@ -7993,7 +7993,7 @@ Overwrite? - XML Streams (*.xml.gz) + XML Streams (*) diff --git a/translations/cantata_es.ts b/translations/cantata_es.ts index 52f874e9d..1550cb215 100644 --- a/translations/cantata_es.ts +++ b/translations/cantata_es.ts @@ -4414,16 +4414,16 @@ i18n: ectx: property (text), widget (QTreeWidget, files) Importar flujos - XML Streams (*.xml *.xml.gz *.cantata) - Flujos XML (*.xml *.xml.gz *.cantata) + XML Streams (*.xml * *.cantata) + Flujos XML (*.xml * *.cantata) Export Streams Exportar flujos - XML Streams (*.xml.gz) - Flujos XML (*.xml.gz) + XML Streams (*) + Flujos XML (*) Bookmark added @@ -12960,8 +12960,8 @@ Overwrite? - XML Streams (*.xml *.xml.gz *.cantata) - Flujos XML (*.xml *.xml.gz *.cantata) + XML Streams (*.xml * *.cantata) + Flujos XML (*.xml * *.cantata) @@ -12970,8 +12970,8 @@ Overwrite? - XML Streams (*.xml.gz) - Flujos XML (*.xml.gz) + XML Streams (*) + Flujos XML (*) diff --git a/translations/cantata_fi.ts b/translations/cantata_fi.ts index 33ff78cfc..a9db46991 100644 --- a/translations/cantata_fi.ts +++ b/translations/cantata_fi.ts @@ -8045,7 +8045,7 @@ Korvataanko se? - XML Streams (*.xml *.xml.gz *.cantata) + XML Streams (*.xml * *.cantata) @@ -8055,7 +8055,7 @@ Korvataanko se? - XML Streams (*.xml.gz) + XML Streams (*) diff --git a/translations/cantata_fr.ts b/translations/cantata_fr.ts index 62d09231b..9e5f73957 100644 --- a/translations/cantata_fr.ts +++ b/translations/cantata_fr.ts @@ -4605,16 +4605,16 @@ i18n: ectx: property (text), widget (UrlNoteLabel, ratingsNote) Importer les flux - XML Streams (*.xml *.xml.gz *.cantata) - Flux XML (*.xml *.xml.gz *.cantata) + XML Streams (*.xml * *.cantata) + Flux XML (*.xml * *.cantata) Export Streams Exporter les flux - XML Streams (*.xml.gz) - Flux XML (*.xml.gz) + XML Streams (*) + Flux XML (*) Failed to create '%1'! @@ -13346,8 +13346,8 @@ Remplacer ? - XML Streams (*.xml *.xml.gz *.cantata) - Flux XML (*.xml *.xml.gz *.cantata) + XML Streams (*.xml * *.cantata) + Flux XML (*.xml * *.cantata) @@ -13356,8 +13356,8 @@ Remplacer ? - XML Streams (*.xml.gz) - Flux XML (*.xml.gz) + XML Streams (*) + Flux XML (*) diff --git a/translations/cantata_hu.ts b/translations/cantata_hu.ts index 9837a06d9..a8337ffd7 100644 --- a/translations/cantata_hu.ts +++ b/translations/cantata_hu.ts @@ -5042,16 +5042,16 @@ i18n: ectx: property (text), widget (UrlNoteLabel, ratingsNote) Stream-ek importálása - XML Streams (*.xml *.xml.gz *.cantata) - XML stream-ek (*.xml *.xml.gz *.cantata) + XML Streams (*.xml * *.cantata) + XML stream-ek (*.xml * *.cantata) Export Streams Stream-ek exportálása - XML Streams (*.xml.gz) - XML adatfolyamok (*.xml.gz) + XML Streams (*) + XML adatfolyamok (*) Failed to create '%1'! @@ -13809,8 +13809,8 @@ Felülírod? - XML Streams (*.xml *.xml.gz *.cantata) - XML stream-ek (*.xml *.xml.gz *.cantata) + XML Streams (*.xml * *.cantata) + XML stream-ek (*.xml * *.cantata) @@ -13819,8 +13819,8 @@ Felülírod? - XML Streams (*.xml.gz) - XML adatfolyamok (*.xml.gz) + XML Streams (*) + XML adatfolyamok (*) diff --git a/translations/cantata_it.ts b/translations/cantata_it.ts index 62f77fafe..4afd359b0 100644 --- a/translations/cantata_it.ts +++ b/translations/cantata_it.ts @@ -8178,8 +8178,8 @@ Sovrascrivere? - XML Streams (*.xml *.xml.gz *.cantata) - Flussi XML (*.xml *.xml.gz *.cantata) + XML Streams (*.xml * *.cantata) + Flussi XML (*.xml * *.cantata) @@ -8188,8 +8188,8 @@ Sovrascrivere? - XML Streams (*.xml.gz) - Flussi XML (*.xml.gz) + XML Streams (*) + Flussi XML (*) diff --git a/translations/cantata_ja.ts b/translations/cantata_ja.ts index c041ea8ae..0b82f0568 100644 --- a/translations/cantata_ja.ts +++ b/translations/cantata_ja.ts @@ -8144,8 +8144,8 @@ Overwrite? - XML Streams (*.xml *.xml.gz *.cantata) - XML ストリーム (*.xml *.xml.gz *.cantata) + XML Streams (*.xml * *.cantata) + XML ストリーム (*.xml * *.cantata) @@ -8154,8 +8154,8 @@ Overwrite? - XML Streams (*.xml.gz) - XML ストリーム (*.xml.gz) + XML Streams (*) + XML ストリーム (*) diff --git a/translations/cantata_ko.ts b/translations/cantata_ko.ts index b2687bb28..1b281ca45 100644 --- a/translations/cantata_ko.ts +++ b/translations/cantata_ko.ts @@ -5592,16 +5592,16 @@ i18n: ectx: property (text), widget (UrlNoteLabel, ratingsNote) 스트림 불러오기 - XML Streams (*.xml *.xml.gz *.cantata) - XML 스트림 (*.xml *.xml.gz *.cantata) + XML Streams (*.xml * *.cantata) + XML 스트림 (*.xml * *.cantata) Export Streams 스트림 내보내기 - XML Streams (*.xml.gz) - XML 스트림 (*.xml.gz) + XML Streams (*) + XML 스트림 (*) Failed to create '%1'! @@ -14397,8 +14397,8 @@ Overwrite? - XML Streams (*.xml *.xml.gz *.cantata) - XML 스트림 (*.xml *.xml.gz *.cantata) + XML Streams (*.xml * *.cantata) + XML 스트림 (*.xml * *.cantata) @@ -14407,8 +14407,8 @@ Overwrite? - XML Streams (*.xml.gz) - XML 스트림 (*.xml.gz) + XML Streams (*) + XML 스트림 (*) diff --git a/translations/cantata_nl.ts b/translations/cantata_nl.ts index 8d1e933ed..981a3380c 100644 --- a/translations/cantata_nl.ts +++ b/translations/cantata_nl.ts @@ -8174,8 +8174,8 @@ Wil je deze overschrijven? - XML Streams (*.xml *.xml.gz *.cantata) - XML-streams (*.xml *.xml.gz *.cantata) + XML Streams (*.xml * *.cantata) + XML-streams (*.xml * *.cantata) @@ -8184,8 +8184,8 @@ Wil je deze overschrijven? - XML Streams (*.xml.gz) - XML-streams (*.xml.gz) + XML Streams (*) + XML-streams (*) diff --git a/translations/cantata_pl.ts b/translations/cantata_pl.ts index f883097b6..a3a22174c 100644 --- a/translations/cantata_pl.ts +++ b/translations/cantata_pl.ts @@ -5629,16 +5629,16 @@ i18n: ectx: property (text), widget (UrlNoteLabel, ratingsNote) Importuj strumienie - XML Streams (*.xml *.xml.gz *.cantata) - Strumienie XML (*.xml *.xml.gz *.cantata) + XML Streams (*.xml * *.cantata) + Strumienie XML (*.xml * *.cantata) Export Streams Eksportuj strumienie - XML Streams (*.xml.gz) - Strumienie XML (*.xml.gz) + XML Streams (*) + Strumienie XML (*) Failed to create '%1'! @@ -14484,8 +14484,8 @@ Nadpisać? - XML Streams (*.xml *.xml.gz *.cantata) - Strumienie XML (*.xml *.xml.gz *.cantata) + XML Streams (*.xml * *.cantata) + Strumienie XML (*.xml * *.cantata) @@ -14494,8 +14494,8 @@ Nadpisać? - XML Streams (*.xml.gz) - Strumienie XML (*.xml.gz) + XML Streams (*) + Strumienie XML (*) diff --git a/translations/cantata_pt_BR.ts b/translations/cantata_pt_BR.ts index 1c6f3be6b..fdbcdf15d 100644 --- a/translations/cantata_pt_BR.ts +++ b/translations/cantata_pt_BR.ts @@ -6563,8 +6563,8 @@ Sobrescrevê-la? Editar - XML Streams (*.xml.gz) - Fluxos XML (*.xml.gz) + XML Streams (*) + Fluxos XML (*) Digitally Imported @@ -6628,8 +6628,8 @@ Sobrescrevê-la? Um fluxo intitulado '%1' já existe! - XML Streams (*.xml *.xml.gz *.cantata) - Fluxos XML (*.xml *.xml.gz *.cantata) + XML Streams (*.xml * *.cantata) + Fluxos XML (*.xml * *.cantata) Added '%1'' to favorites diff --git a/translations/cantata_ru.ts b/translations/cantata_ru.ts index b2a51f1fd..d6429e313 100644 --- a/translations/cantata_ru.ts +++ b/translations/cantata_ru.ts @@ -5062,16 +5062,16 @@ i18n: ectx: property (text), widget (UrlNoteLabel, ratingsNote) Импортировать потоки - XML Streams (*.xml *.xml.gz *.cantata) - Потоки XML (*.xml *.xml.gz *.cantata) + XML Streams (*.xml * *.cantata) + Потоки XML (*.xml * *.cantata) Export Streams Экспортировать потоки - XML Streams (*.xml.gz) - Потоки XML (*.xml.gz) + XML Streams (*) + Потоки XML (*) Failed to create '%1'! @@ -13871,8 +13871,8 @@ Overwrite? - XML Streams (*.xml *.xml.gz *.cantata) - Потоки XML (*.xml *.xml.gz *.cantata) + XML Streams (*.xml * *.cantata) + Потоки XML (*.xml * *.cantata) @@ -13881,8 +13881,8 @@ Overwrite? - XML Streams (*.xml.gz) - Потоки XML (*.xml.gz) + XML Streams (*) + Потоки XML (*) diff --git a/translations/cantata_zh_CN.ts b/translations/cantata_zh_CN.ts index 5e21e3ded..6b31c9d69 100644 --- a/translations/cantata_zh_CN.ts +++ b/translations/cantata_zh_CN.ts @@ -10375,7 +10375,7 @@ Overwrite? - XML Streams (*.xml *.xml.gz *.cantata) + XML Streams (*.xml * *.cantata) @@ -10385,7 +10385,7 @@ Overwrite? - XML Streams (*.xml.gz) + XML Streams (*)