diff options
Diffstat (limited to '')
38 files changed, 305 insertions, 967 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a3063d66..62eb7f0f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -267,7 +267,7 @@ elseif (TEST_BUILD) endif () # Introduce boost -find_package(Boost COMPONENTS date_time filesystem REQUIRED) +find_package(Boost COMPONENTS date_time filesystem locale REQUIRED) if (QT5_ENV_SUPPORT) # Support Qt version Both 5.12.x and 5.15.x diff --git a/TRANSLATORS b/TRANSLATORS new file mode 100644 index 00000000..a5e9b011 --- /dev/null +++ b/TRANSLATORS @@ -0,0 +1,5 @@ +Translators: +Google Translation Machine + +Reviewers: +Saturneric(zh_CN)
\ No newline at end of file diff --git a/resource/COPYING b/resource/COPYING deleted file mode 100644 index 78af1af5..00000000 --- a/resource/COPYING +++ /dev/null @@ -1,676 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - dirModel, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - <program> Copyright (C) <year> <name of author> - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -<http://www.gnu.org/licenses/>. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -<http://www.gnu.org/philosophy/why-not-lgpl.html>. - - diff --git a/resource/README b/resource/README deleted file mode 100644 index ac1ed34b..00000000 --- a/resource/README +++ /dev/null @@ -1,49 +0,0 @@ -ABOUT ------ -gpg4usb is an easy to use, small portable editor with the possibility -to encrypt and decrypt any text-message or -file you want. For encryption it acts as -a gpg-frontend (http://gnupg.org/). Its intend is to be used from an usb-stick, -running on Windows(TM) and Linux. Providing a mac-binary is on our TODO-list. - -Our aim is, to give anyone the possibility to send and receive secure encrypted -messages anywhere - on any computer out there, no matter if Microsoft Windows(TM) -or Linux is running on it. Therefore it's usage should be self-describing, and the -user-interface is kept as simple as possible. - -Of course gpg4usb is open source, as are included libs and binaries. - -OBTAINING ---------- -You can get prepacked zip-files from http://gpg4usb.cpunk.de/download.html . -For retrieving the source checkout http://cpunk.de/svn/src/ . - -HOWTO USE ---------- -1. Unzip gpg4usb.zip on your usb-stick. -2. start programm with start_windows.exe or start_linux (depending on your os) -3. import your private key and some public keys -4. enjoy portable encryption ;-) - -CONTACT -------- -If you have any questions and/or suggestions contact us at [email protected] - or feel free to meet us at [email protected] - -Our homepage is located at http://gpg4usb.cpunk.de . - -LICENSES --------- -gpg4usb itself is licensed under the GPLv3 (see COPYING). - -There are some libraries and the gpg-binary included in the zip-file / a static -gpg-build which (may) have different licenses, for more information check -their homepages. You can also obtain the sources from there. - -GPG: http://gnupg.org/ -QT: http://trolltech.no/ , http://trolltech.no/downloads/opensource - -Iconset used is Nuvola (http://icon-king.com/?p=15), which has a LGPL License - -The key image in the wizard (keys12.jpg) is a croped version of -http://www.flickr.com/photos/laureenp/6141822934/, which is licensed cc by-nc-sa. -Our derived work is also cc by-nc-sa diff --git a/resource/TRANSLATORS b/resource/TRANSLATORS deleted file mode 100644 index ec4a869d..00000000 --- a/resource/TRANSLATORS +++ /dev/null @@ -1,11 +0,0 @@ -Viriato/Phol (es) -Russell (my) -Alessandro (pt_br) -Kirill (ru) -Tom (vi) -Jedi (zh_tw) -Åke (sv) -Bogaczm (pl) -Ahmad (ar) -Elad (he) -Chen (zh) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index bf9a89c2..9ec83bc8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -92,6 +92,8 @@ if (MULTI_LANG_SUPPORT) TARGET translations COMMAND msgfmt --check --verbose --output-file ${CMAKE_SOURCE_DIR}/resource/locale/out/${_langName}/LC_MESSAGES/GpgFrontend.mo ${_poFile} ) + add_custom_command(TARGET translations + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/resource/locale/out/ ${RESOURCE_OUTPUT_DIRECTORY}/locales) endforeach () endif () @@ -111,6 +113,7 @@ if (APPLICATION_BUILD) make_directory(${RESOURCE_OUTPUT_DIRECTORY}/locales) file(COPY ${CMAKE_SOURCE_DIR}/resource/locale/out/ DESTINATION ${RESOURCE_OUTPUT_DIRECTORY}/locales FOLLOW_SYMLINK_CHAIN) endif () + file(COPY ${CMAKE_SOURCE_DIR}/TRANSLATORS DESTINATION ${RESOURCE_OUTPUT_DIRECTORY} FOLLOW_SYMLINK_CHAIN) endif () if (APPLICATION_BUILD) @@ -204,8 +207,9 @@ if (APPLICATION_BUILD) set(GPGFRONTEND_AFTER_UI_LIBS ${GPGFRONTEND_AFTER_UI_LIBS} server) endif () - set(GPGFRONTEND_LIBS ${GPGFRONTEND_AFTER_UI_LIBS} gpgfrontend-ui ${GPGFRONTEND_BEFORE_UI_LIBS} gpg_core easy_logging_pp) + set(GPGFRONTEND_LIBS ${GPGFRONTEND_AFTER_UI_LIBS} gpgfrontend-ui gpg_core ${GPGFRONTEND_BEFORE_UI_LIBS} easy_logging_pp) set(QT_DEPENDENCY_LIBS Qt5::Network Qt5::PrintSupport Qt5::Widgets Qt5::Test Qt5::Core) + message(STATUS "Boost Libraries ${Boost_LIBRARIES}") IF (MINGW) message(STATUS "Link Application Static Library For MINGW") @@ -216,12 +220,14 @@ if (APPLICATION_BUILD) target_link_libraries(${AppName} ${GPGFRONTEND_LIBS} ${QT_DEPENDENCY_LIBS} + ${Boost_LIBRARIES} ${libintl} ${libiconv} ${libconfig} crypto ssl) elseif (APPLE) message(STATUS "Link Application Static Library For macOS") target_link_libraries(${AppName} ${GPGFRONTEND_LIBS} ${QT_DEPENDENCY_LIBS} + ${Boost_LIBRARIES} crypto ssl intl) else () message(STATUS "Link Application Static Library For UNIX ") @@ -232,6 +238,7 @@ if (APPLICATION_BUILD) target_link_libraries(${AppName} ${GPGFRONTEND_LIBS} ${QT_DEPENDENCY_LIBS} + ${Boost_LIBRARIES} crypto ssl pthread) endif () endif () diff --git a/src/gpg/GpgGenKeyInfo.cpp b/src/gpg/GpgGenKeyInfo.cpp index 07708433..4a0a99fc 100644 --- a/src/gpg/GpgGenKeyInfo.cpp +++ b/src/gpg/GpgGenKeyInfo.cpp @@ -147,9 +147,9 @@ void GpgFrontend::GenKeyInfo::setKeySize(int m_key_size) { } void GpgFrontend::GenKeyInfo::setExpired( - const boost::gregorian::date &m_expired) { + const boost::posix_time::ptime &m_expired) { using namespace boost::gregorian; - auto current = day_clock::local_day(); + auto current = boost::posix_time::second_clock::local_time(); if (isNonExpired() && m_expired < current + years(2)) { GenKeyInfo::expired = m_expired; } @@ -157,7 +157,7 @@ void GpgFrontend::GenKeyInfo::setExpired( void GpgFrontend::GenKeyInfo::setNonExpired(bool m_non_expired) { using namespace boost::posix_time; - if (!m_non_expired) this->expired = from_time_t(0).date(); + if (!m_non_expired) this->expired = from_time_t(0); GenKeyInfo::nonExpired = m_non_expired; } diff --git a/src/gpg/GpgGenKeyInfo.h b/src/gpg/GpgGenKeyInfo.h index 53b0c9f1..14290e17 100644 --- a/src/gpg/GpgGenKeyInfo.h +++ b/src/gpg/GpgGenKeyInfo.h @@ -37,8 +37,9 @@ class GenKeyInfo { std::string userid; std::string algo; int keySize = 2048; - boost::gregorian::date expired = - boost::gregorian::day_clock::local_day() + boost::gregorian::years(2); + boost::posix_time::ptime expired = + boost::posix_time::second_clock::local_time() + + boost::gregorian::years(2); bool nonExpired = false; bool noPassPhrase = false; @@ -73,11 +74,11 @@ class GenKeyInfo { void setKeySize(int m_key_size); - [[nodiscard]] const boost::gregorian::date &getExpired() const { + [[nodiscard]] const boost::posix_time::ptime &getExpired() const { return expired; } - void setExpired(const boost::gregorian::date &m_expired); + void setExpired(const boost::posix_time::ptime &m_expired); [[nodiscard]] bool isNonExpired() const { return nonExpired; } diff --git a/src/gpg/function/GpgKeyManager.cpp b/src/gpg/function/GpgKeyManager.cpp index 9e24b3d6..998c27a7 100644 --- a/src/gpg/function/GpgKeyManager.cpp +++ b/src/gpg/function/GpgKeyManager.cpp @@ -33,7 +33,7 @@ bool GpgFrontend::GpgKeyManager::signKey( const GpgFrontend::GpgKey& target, GpgFrontend::KeyArgsList& keys, const std::string& uid, - const std::unique_ptr<boost::gregorian::date>& expires) { + const std::unique_ptr<boost::posix_time::ptime>& expires) { using namespace boost::posix_time; BasicOperator::GetInstance().SetSigners(keys); @@ -44,7 +44,7 @@ bool GpgFrontend::GpgKeyManager::signKey( if (expires == nullptr) flags |= GPGME_KEYSIGN_NOEXPIRE; else - expires_time_t = to_time_t(ptime(*expires)); + expires_time_t = to_time_t(*expires); auto err = check_gpg_error(gpgme_op_keysign( ctx, gpgme_key_t(target), uid.c_str(), expires_time_t, flags)); @@ -70,7 +70,7 @@ bool GpgFrontend::GpgKeyManager::revSign( bool GpgFrontend::GpgKeyManager::setExpire( const GpgFrontend::GpgKey& key, std::unique_ptr<GpgSubKey>& subkey, - std::unique_ptr<boost::gregorian::date>& expires) { + std::unique_ptr<boost::posix_time::ptime>& expires) { using namespace boost::posix_time; unsigned long expires_time = 0; diff --git a/src/gpg/function/GpgKeyManager.h b/src/gpg/function/GpgKeyManager.h index 2b07425c..01254962 100644 --- a/src/gpg/function/GpgKeyManager.h +++ b/src/gpg/function/GpgKeyManager.h @@ -41,13 +41,13 @@ class GpgKeyManager : public SingletonFunctionObject<GpgKeyManager> { * @return if successful */ bool signKey(const GpgKey& target, KeyArgsList& keys, const std::string& uid, - const std::unique_ptr<boost::gregorian::date>& expires); + const std::unique_ptr<boost::posix_time::ptime>& expires); bool revSign(const GpgFrontend::GpgKey& key, const GpgFrontend::SignIdArgsListPtr& signature_id); bool setExpire(const GpgKey& key, std::unique_ptr<GpgSubKey>& subkey, - std::unique_ptr<boost::gregorian::date>& expires); + std::unique_ptr<boost::posix_time::ptime>& expires); private: GpgContext& ctx = GpgContext::GetInstance(); diff --git a/src/gpg/function/GpgKeyOpera.cpp b/src/gpg/function/GpgKeyOpera.cpp index d0172a31..cdf5ab24 100644 --- a/src/gpg/function/GpgKeyOpera.cpp +++ b/src/gpg/function/GpgKeyOpera.cpp @@ -63,17 +63,19 @@ void GpgFrontend::GpgKeyOpera::DeleteKeys( */ GpgFrontend::GpgError GpgFrontend::GpgKeyOpera::SetExpire( const GpgKey& key, const SubkeyId& subkey_fpr, - std::unique_ptr<boost::gregorian::date>& expires) { + std::unique_ptr<boost::posix_time::ptime>& expires) { unsigned long expires_time = 0; + + LOG(INFO) << "expires" << *expires; + if (expires != nullptr) { using namespace boost::posix_time; using namespace std::chrono; - expires_time = to_time_t(ptime(*expires)) - - system_clock::to_time_t(system_clock::now()); + expires_time = + to_time_t(*expires) - system_clock::to_time_t(system_clock::now()); } - LOG(INFO) << "GpgFrontend::GpgKeyOpera::SetExpire" << key.id() << subkey_fpr - << expires_time; + LOG(INFO) << key.id() << subkey_fpr << expires_time; GpgError err; if (subkey_fpr.empty()) diff --git a/src/gpg/function/GpgKeyOpera.h b/src/gpg/function/GpgKeyOpera.h index 568a125d..7decfd79 100644 --- a/src/gpg/function/GpgKeyOpera.h +++ b/src/gpg/function/GpgKeyOpera.h @@ -36,7 +36,7 @@ class GpgKeyOpera : public SingletonFunctionObject<GpgKeyOpera> { void DeleteKeys(KeyIdArgsListPtr key_ids); GpgError SetExpire(const GpgKey& key, const SubkeyId& subkey_fpr, - std::unique_ptr<boost::gregorian::date>& expires); + std::unique_ptr<boost::posix_time::ptime>& expires); static void GenerateRevokeCert(const GpgKey& key, const std::string& output_file_name); diff --git a/src/gpg/model/GpgKey.h b/src/gpg/model/GpgKey.h index 53c074e8..3bebcd41 100644 --- a/src/gpg/model/GpgKey.h +++ b/src/gpg/model/GpgKey.h @@ -73,18 +73,17 @@ class GpgKey { return gpgme_pubkey_algo_name(_key_ref->subkeys->pubkey_algo); } - [[nodiscard]] boost::gregorian::date last_update() const { + [[nodiscard]] boost::posix_time::ptime last_update() const { return boost::posix_time::from_time_t( - static_cast<time_t>(_key_ref->last_update)) - .date(); + static_cast<time_t>(_key_ref->last_update)); } - [[nodiscard]] boost::gregorian::date expires() const { - return boost::posix_time::from_time_t(_key_ref->subkeys->expires).date(); + [[nodiscard]] boost::posix_time::ptime expires() const { + return boost::posix_time::from_time_t(_key_ref->subkeys->expires); }; - [[nodiscard]] boost::gregorian::date create_time() const { - return boost::posix_time::from_time_t(_key_ref->subkeys->timestamp).date(); + [[nodiscard]] boost::posix_time::ptime create_time() const { + return boost::posix_time::from_time_t(_key_ref->subkeys->timestamp); }; [[nodiscard]] unsigned int length() const { diff --git a/src/gpg/model/GpgKeySignature.h b/src/gpg/model/GpgKeySignature.h index 70eaeb1c..d08162fc 100644 --- a/src/gpg/model/GpgKeySignature.h +++ b/src/gpg/model/GpgKeySignature.h @@ -46,11 +46,11 @@ class GpgKeySignature { return gpgme_pubkey_algo_name(_signature_ref->pubkey_algo); } - [[nodiscard]] boost::gregorian::date create_time() const { - return boost::posix_time::from_time_t(_signature_ref->timestamp).date(); + [[nodiscard]] boost::posix_time::ptime create_time() const { + return boost::posix_time::from_time_t(_signature_ref->timestamp); } - [[nodiscard]] boost::gregorian::date expire_time() const { - return boost::posix_time::from_time_t(_signature_ref->expires).date(); + [[nodiscard]] boost::posix_time::ptime expire_time() const { + return boost::posix_time::from_time_t(_signature_ref->expires); } [[nodiscard]] std::string uid() const { return _signature_ref->uid; } diff --git a/src/gpg/model/GpgSignature.h b/src/gpg/model/GpgSignature.h index 347cceb1..419bf9cf 100644 --- a/src/gpg/model/GpgSignature.h +++ b/src/gpg/model/GpgSignature.h @@ -51,11 +51,11 @@ class GpgSignature { return gpgme_hash_algo_name(_signature_ref->hash_algo); } - [[nodiscard]] boost::gregorian::date create_time() const { - return boost::posix_time::from_time_t(_signature_ref->timestamp).date(); + [[nodiscard]] boost::posix_time::ptime create_time() const { + return boost::posix_time::from_time_t(_signature_ref->timestamp); } - [[nodiscard]] boost::gregorian::date expire_time() const { - return boost::posix_time::from_time_t(_signature_ref->exp_timestamp).date(); + [[nodiscard]] boost::posix_time::ptime expire_time() const { + return boost::posix_time::from_time_t(_signature_ref->exp_timestamp); } [[nodiscard]] std::string fpr() const { return _signature_ref->fpr; } diff --git a/src/gpg/model/GpgSubKey.h b/src/gpg/model/GpgSubKey.h index 3ee93a0c..462dcbca 100644 --- a/src/gpg/model/GpgSubKey.h +++ b/src/gpg/model/GpgSubKey.h @@ -66,12 +66,12 @@ class GpgSubKey { [[nodiscard]] bool is_cardkey() const { return _subkey_ref->is_cardkey; } - [[nodiscard]] boost::gregorian::date timestamp() const { - return boost::posix_time::from_time_t(_subkey_ref->timestamp).date(); + [[nodiscard]] boost::posix_time::ptime timestamp() const { + return boost::posix_time::from_time_t(_subkey_ref->timestamp); } - [[nodiscard]] boost::gregorian::date expires() const { - return boost::posix_time::from_time_t(_subkey_ref->expires).date(); + [[nodiscard]] boost::posix_time::ptime expires() const { + return boost::posix_time::from_time_t(_subkey_ref->expires); } GpgSubKey() = default; diff --git a/src/main.cpp b/src/main.cpp index 983d062b..066231fb 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -22,6 +22,8 @@ * */ +#include <boost/locale.hpp> + #include "GpgFrontendBuildInfo.h" #include "ui/MainWindow.h" #include "ui/settings/GlobalSettingStation.h" @@ -138,6 +140,9 @@ void init_locale() { GpgFrontend::UI::GlobalSettingStation::GetInstance().Sync(); auto* locale_name = setlocale(LC_ALL, nullptr); + boost::locale::generator gen; + // Create locale generator + std::locale::global(gen(locale_name)); LOG(INFO) << "current system locale" << locale_name; // read from settings file diff --git a/src/ui/MainWindow.h b/src/ui/MainWindow.h index 839abb98..97c5c73f 100644 --- a/src/ui/MainWindow.h +++ b/src/ui/MainWindow.h @@ -219,16 +219,6 @@ class MainWindow : public QMainWindow { void slotOpenKeyManagement(); /** - * @details Open about-dialog. - */ - void slotAbout(); - - /** - * @details Open check-update-tab in about-dialog. - */ - void slotCheckUpdate(); - - /** * @details Open File Opera Tab */ void slotOpenFileTab(); @@ -402,6 +392,7 @@ class MainWindow : public QMainWindow { QAction* zoomOutAct{}; /** Action to zoom out */ QAction* aboutAct{}; /** Action to open about dialog */ QAction* checkUpdateAct{}; /** Action to open about dialog */ + QAction* translateAct{}; /** Action to open about dialog */ QAction* fileEncryptAct{}; /** Action to open dialog for encrypting file */ QAction* fileDecryptAct{}; /** Action to open dialog for decrypting file */ QAction* fileSignAct{}; /** Action to open dialog for signing file */ diff --git a/src/ui/Wizard.cpp b/src/ui/Wizard.cpp index 3df00683..9f0626ff 100644 --- a/src/ui/Wizard.cpp +++ b/src/ui/Wizard.cpp @@ -232,15 +232,15 @@ ConclusionPage::ConclusionPage(QWidget* parent) : QWizardPage(parent) { setTitle(_("Ready.")); setSubTitle(_("Have fun with GpgFrontend!")); - auto* bottomLabel = - new QLabel(QString(_("You are ready to use GpgFrontend now.<br><br>")) + - "<a " - "href=\"https://saturneric.github.io/GpgFrontend/index.html#/" - "overview\">" + - _("The Online Document") + "</a>" + - _(" will get you started with GpgFrontend. It will open in " - "the main window.") + - "<br>"); + auto* bottomLabel = new QLabel( + QString(_("You are ready to use GpgFrontend now.<br><br>")) + + "<a " + "href=\"https://saturneric.github.io/GpgFrontend/index.html#/" + "overview\">" + + _("The Online Document") + "</a>" + + _(" will get you started with GpgFrontend. Anytime you encounter " + "problems, please try to find help from the documentation") + + "<br>"); bottomLabel->setTextFormat(Qt::RichText); bottomLabel->setTextInteractionFlags(Qt::TextBrowserInteraction); diff --git a/src/ui/help/AboutDialog.cpp b/src/ui/help/AboutDialog.cpp index 72100713..1dd06933 100644 --- a/src/ui/help/AboutDialog.cpp +++ b/src/ui/help/AboutDialog.cpp @@ -26,6 +26,7 @@ #include "GpgFrontendBuildInfo.h" #include "function/VersionCheckThread.h" +#include "ui/settings/GlobalSettingStation.h" namespace GpgFrontend::UI { @@ -37,7 +38,7 @@ AboutDialog::AboutDialog(int defaultIndex, QWidget* parent) : QDialog(parent) { auto* translatorsTab = new TranslatorsTab(); updateTab = new UpdateTab(); - tabWidget->addTab(infoTab, _("General")); + tabWidget->addTab(infoTab, _("About Software")); tabWidget->addTab(translatorsTab, _("Translators")); tabWidget->addTab(updateTab, _("Update")); @@ -56,7 +57,8 @@ AboutDialog::AboutDialog(int defaultIndex, QWidget* parent) : QDialog(parent) { mainLayout->addWidget(buttonBox); setLayout(mainLayout); - this->resize(320, 580); + this->resize(450, 580); + this->setMinimumWidth(450); this->show(); } @@ -70,20 +72,20 @@ InfoTab::InfoTab(QWidget* parent) : QWidget(parent) { auto* text = new QString( "<center><h2>" + qApp->applicationName() + "</h2></center>" + "<center><b>" + qApp->applicationVersion() + "</b></center>" + - "<center>" + GIT_VERSION + "</center>" + - _("<br><center>GpgFrontend is an easy-to-use, compact, cross-platform, " - "<br>" - "and installation-free gpg front-end tool.<br>" - "It visualizes most of the common operations of gpg commands.<br>" - "It's licensed under the GPL v3<br><br>" - "<b>Developer:</b><br>" - "Saturneric<br><br>" - "If you have any questions or suggestions, raise an issue<br/>" - "at <a href=\"https://github.com/saturneric/GpgFrontend\">GitHub</a> " - "or send a mail to my mailing list at <a " - "href=\"mailto:[email protected]\">[email protected]</a>.") + - "<br><br> " + _("Built with Qt") + " " + qVersion() + " " + - _("and GPGME") + " " + + "<center>" + GIT_VERSION + "</center>" + "<br><center>" + + _("GpgFrontend is an easy-to-use, compact, cross-platform, " + "and installation-free gpg front-end tool." + "It visualizes most of the common operations of gpg commands." + "It's licensed under the GPL v3") + + "<br><br>" + "<b>" + + _("Developer:") + "</b><br>" + "Saturneric" + "<br><br>" + + _("If you have any questions or suggestions, raise an issue at") + + "<br/>" + " <a href=\"https://github.com/saturneric/GpgFrontend\">GitHub</a> " + + _("or send a mail to my mailing list at") + " <a " + + "href=\"mailto:[email protected]\">[email protected]</a>." + "<br><br> " + + _("Built with Qt") + " " + qVersion() + " " + _("and GPGME") + " " + GpgFrontend::GpgContext::getGpgmeVersion().c_str() + "<br>" + _("Built at") + " " + BUILD_TIMESTAMP + "</center>"); @@ -93,6 +95,7 @@ InfoTab::InfoTab(QWidget* parent) : QWidget(parent) { layout->addWidget(pixmapLabel, 0, 0, 1, -1, Qt::AlignCenter); auto* aboutLabel = new QLabel(); aboutLabel->setText(*text); + aboutLabel->setWordWrap(true); aboutLabel->setOpenExternalLinks(true); layout->addWidget(aboutLabel, 1, 0, 1, -1); layout->addItem( @@ -104,18 +107,31 @@ InfoTab::InfoTab(QWidget* parent) : QWidget(parent) { TranslatorsTab::TranslatorsTab(QWidget* parent) : QWidget(parent) { QFile translatorsFile; - translatorsFile.setFileName(qApp->applicationDirPath() + "/About"); + auto translators_file = + GlobalSettingStation::GetInstance().GetResourceDir() / "TRANSLATORS"; + translatorsFile.setFileName(translators_file.string().c_str()); translatorsFile.open(QIODevice::ReadOnly); QByteArray inBuffer = translatorsFile.readAll(); auto* label = new QLabel(inBuffer); + auto* mainLayout = new QVBoxLayout(this); mainLayout->addWidget(label); + mainLayout->addStretch(); + + auto notice_label = new QLabel( + _("If you think there are any problems with the translation, why not " + "participate in the translation work? If you want to participate, " + "please " + "read the document or contact me via email."), + this); + notice_label->setWordWrap(true); + mainLayout->addWidget(notice_label); setLayout(mainLayout); } -UpdateTab::UpdateTab(QWidget* parent) { +UpdateTab::UpdateTab(QWidget* parent) : QWidget(parent) { auto* pixmap = new QPixmap(":gpgfrontend-logo.png"); auto* layout = new QGridLayout(); auto* pixmapLabel = new QLabel(); @@ -131,7 +147,7 @@ UpdateTab::UpdateTab(QWidget* parent) { "<center>" + QString(_("It is recommended that you always check the version " "of GpgFrontend and upgrade to the latest version.")) + - "</center><br><center>" + + "</center><center>" + _("New versions not only represent new features, but " "also often represent functional and security fixes.") + "</center>"); @@ -149,13 +165,12 @@ UpdateTab::UpdateTab(QWidget* parent) { upgradeLabel = new QLabel(); upgradeLabel->setText( "<center>" + - QString( - _("The current version is inconsistent with the latest version on " - "github.")) + - "</center><br><center>" + _("Please click") + + QString(_("The current version is less than the latest version on " + "github.")) + + "</center><center>" + _("Please click") + " <a " - "href=\"https://github.com/saturneric/GpgFrontend/releases\">here</a> " + - _("to download the latest version.") + "</center>"); + "href=\"https://github.com/saturneric/GpgFrontend/releases\">" + + _("Here") + "</a> " + _("to download the latest version.") + "</center>"); upgradeLabel->setWordWrap(true); upgradeLabel->setOpenExternalLinks(true); upgradeLabel->setHidden(true); @@ -173,16 +188,13 @@ UpdateTab::UpdateTab(QWidget* parent) { new QSpacerItem(20, 10, QSizePolicy::Minimum, QSizePolicy::Fixed), 2, 1, 1, 1); - connect(this, SIGNAL(replyFromUpdateServer(QByteArray)), this, - SLOT(processReplyDataFromUpdateServer(QByteArray))); - setLayout(layout); } void UpdateTab::getLatestVersion() { this->pb->setHidden(false); - LOG(INFO) << "try to get latest version"; + LOG(INFO) << _("try to get latest version"); QString base_url = "https://api.github.com/repos/saturneric/gpgfrontend/releases/latest"; @@ -205,6 +217,10 @@ void UpdateTab::slotShowVersionStatus(const QString& current, latestVersionLabel->setText("<center><b>" + QString(_("Latest Version From Github")) + ": " + server + "</b></center>"); + + if (true || current < server) { + upgradeLabel->show(); + } } } // namespace GpgFrontend::UI diff --git a/src/ui/help/AboutDialog.h b/src/ui/help/AboutDialog.h index 4d43600e..78c98149 100644 --- a/src/ui/help/AboutDialog.h +++ b/src/ui/help/AboutDialog.h @@ -59,14 +59,11 @@ class UpdateTab : public QWidget { Q_OBJECT QLabel* currentVersionLabel; - QLabel* latestVersionLabel; - QLabel* upgradeLabel; - QProgressBar* pb; - QString currentVersion; + QPushButton* downloadButton; QNetworkAccessManager* manager = new QNetworkAccessManager(this); diff --git a/src/ui/keygen/KeygenDialog.cpp b/src/ui/keygen/KeygenDialog.cpp index 382be5cb..bcbdbffa 100644 --- a/src/ui/keygen/KeygenDialog.cpp +++ b/src/ui/keygen/KeygenDialog.cpp @@ -106,8 +106,7 @@ void KeyGenDialog::slotKeyGenAccept() { genKeyInfo->setNonExpired(true); } else { genKeyInfo->setExpired( - boost::posix_time::from_time_t(dateEdit->dateTime().toTime_t()) - .date()); + boost::posix_time::from_time_t(dateEdit->dateTime().toTime_t())); } gpgme_error_t error = false; diff --git a/src/ui/keygen/SubkeyGenerateDialog.cpp b/src/ui/keygen/SubkeyGenerateDialog.cpp index 593b1cae..53ecd8e3 100644 --- a/src/ui/keygen/SubkeyGenerateDialog.cpp +++ b/src/ui/keygen/SubkeyGenerateDialog.cpp @@ -234,8 +234,7 @@ void SubkeyGenerateDialog::slotKeyGenAccept() { genKeyInfo->setNonExpired(true); } else { genKeyInfo->setExpired( - boost::posix_time::from_time_t(dateEdit->dateTime().toTime_t()) - .date()); + boost::posix_time::from_time_t(dateEdit->dateTime().toTime_t())); } GpgError error; diff --git a/src/ui/keypair_details/KeyPairDetailTab.cpp b/src/ui/keypair_details/KeyPairDetailTab.cpp index 3e1ec319..916aa6a1 100644 --- a/src/ui/keypair_details/KeyPairDetailTab.cpp +++ b/src/ui/keypair_details/KeyPairDetailTab.cpp @@ -24,6 +24,8 @@ #include "ui/keypair_details/KeyPairDetailTab.h" +#include <boost/locale.hpp> + #include "gpg/function/GpgKeyGetter.h" #include "gpg/function/GpgKeyImportExportor.h" #include "gpg/function/GpgKeyOpera.h" @@ -55,31 +57,9 @@ KeyPairDetailTab::KeyPairDetailTab(const std::string& key_id, QWidget* parent) keySizeVarLabel = new QLabel(); expireVarLabel = new QLabel(); createdVarLabel = new QLabel(); + lastUpdateVarLabel = new QLabel(); algorithmVarLabel = new QLabel(); - - // Show the situation that master key not exists. - masterKeyExistVarLabel = - new QLabel(mKey.has_master_key() ? _("Exists") : _("Not Exists")); - if (!mKey.has_master_key()) { - auto paletteExpired = masterKeyExistVarLabel->palette(); - paletteExpired.setColor(masterKeyExistVarLabel->foregroundRole(), Qt::red); - masterKeyExistVarLabel->setPalette(paletteExpired); - } else { - auto paletteValid = masterKeyExistVarLabel->palette(); - paletteValid.setColor(masterKeyExistVarLabel->foregroundRole(), - Qt::darkGreen); - masterKeyExistVarLabel->setPalette(paletteValid); - } - - if (mKey.expired()) { - auto paletteExpired = expireVarLabel->palette(); - paletteExpired.setColor(expireVarLabel->foregroundRole(), Qt::red); - expireVarLabel->setPalette(paletteExpired); - } else { - auto paletteValid = expireVarLabel->palette(); - paletteValid.setColor(expireVarLabel->foregroundRole(), Qt::darkGreen); - expireVarLabel->setPalette(paletteValid); - } + masterKeyExistVarLabel = new QLabel(); auto* mvbox = new QVBoxLayout(); auto* vboxKD = new QGridLayout(); @@ -97,26 +77,28 @@ KeyPairDetailTab::KeyPairDetailTab(const std::string& key_id, QWidget* parent) vboxKD->addWidget(new QLabel(QString(_("Key Size")) + ": "), 2, 0); vboxKD->addWidget(new QLabel(QString(_("Nominal Usage")) + ": "), 3, 0); vboxKD->addWidget(new QLabel(QString(_("Actual Usage")) + ": "), 4, 0); - vboxKD->addWidget(new QLabel(QString(_("Expires on")) + ": "), 5, 0); - vboxKD->addWidget(new QLabel(QString(_("Last Update")) + ": "), 6, 0); - vboxKD->addWidget(new QLabel(QString(_("Secret Key Existence")) + ": "), 7, + vboxKD->addWidget(new QLabel(QString(_("Create Date")) + ": "), 5, 0); + vboxKD->addWidget(new QLabel(QString(_("Expires on")) + ": "), 6, 0); + vboxKD->addWidget(new QLabel(QString(_("Last Update")) + ": "), 7, 0); + vboxKD->addWidget(new QLabel(QString(_("Master Key Existence")) + ": "), 8, 0); vboxKD->addWidget(keySizeVarLabel, 2, 1); - vboxKD->addWidget(expireVarLabel, 5, 1); + vboxKD->addWidget(expireVarLabel, 6, 1); vboxKD->addWidget(algorithmVarLabel, 1, 1); - vboxKD->addWidget(createdVarLabel, 6, 1); + vboxKD->addWidget(createdVarLabel, 5, 1); + vboxKD->addWidget(lastUpdateVarLabel, 7, 1); vboxKD->addWidget(keyidVarLabel, 0, 1); vboxKD->addWidget(usageVarLabel, 3, 1); vboxKD->addWidget(actualUsageVarLabel, 4, 1); - vboxKD->addWidget(masterKeyExistVarLabel, 7, 1); + vboxKD->addWidget(masterKeyExistVarLabel, 8, 1); ownerBox->setLayout(vboxOD); mvbox->addWidget(ownerBox); keyBox->setLayout(vboxKD); mvbox->addWidget(keyBox); - fingerPrintVarLabel = new QLabel(beautify_fingerprint(mKey.fpr()).c_str()); + fingerPrintVarLabel = new QLabel(); fingerPrintVarLabel->setWordWrap(false); fingerPrintVarLabel->setTextInteractionFlags(Qt::TextSelectableByMouse); fingerPrintVarLabel->setStyleSheet("margin-left: 0; margin-right: 5;"); @@ -305,51 +287,80 @@ void KeyPairDetailTab::slotModifyEditDatetime() { } void KeyPairDetailTab::slotRefreshKeyInfo() { + // Show the situation that master key not exists. + masterKeyExistVarLabel->setText(mKey.has_master_key() ? _("Exists") + : _("Not Exists")); + if (!mKey.has_master_key()) { + auto paletteExpired = masterKeyExistVarLabel->palette(); + paletteExpired.setColor(masterKeyExistVarLabel->foregroundRole(), Qt::red); + masterKeyExistVarLabel->setPalette(paletteExpired); + } else { + auto paletteValid = masterKeyExistVarLabel->palette(); + paletteValid.setColor(masterKeyExistVarLabel->foregroundRole(), + Qt::darkGreen); + masterKeyExistVarLabel->setPalette(paletteValid); + } + + if (mKey.expired()) { + auto paletteExpired = expireVarLabel->palette(); + paletteExpired.setColor(expireVarLabel->foregroundRole(), Qt::red); + expireVarLabel->setPalette(paletteExpired); + } else { + auto paletteValid = expireVarLabel->palette(); + paletteValid.setColor(expireVarLabel->foregroundRole(), Qt::darkGreen); + expireVarLabel->setPalette(paletteValid); + } + nameVarLabel->setText(QString::fromStdString(mKey.name())); emailVarLabel->setText(QString::fromStdString(mKey.email())); commentVarLabel->setText(QString::fromStdString(mKey.comment())); keyidVarLabel->setText(QString::fromStdString(mKey.id())); - QString usage; - QTextStream usage_steam(&usage); + std::stringstream usage_steam; - if (mKey.can_certify()) usage_steam << _("Cert") << " "; - if (mKey.can_encrypt()) usage_steam << _("Encr") << " "; + if (mKey.can_certify()) usage_steam << _("Certificate") << " "; + if (mKey.can_encrypt()) usage_steam << _("Encrypt") << " "; if (mKey.can_sign()) usage_steam << _("Sign") << " "; if (mKey.can_authenticate()) usage_steam << _("Auth") << " "; - usageVarLabel->setText(usage); + usageVarLabel->setText(usage_steam.str().c_str()); - QString actualUsage; - QTextStream actual_usage_steam(&actualUsage); + std::stringstream actual_usage_steam; - if (mKey.CanCertActual()) actual_usage_steam << _("Cert") << " "; - if (mKey.CanEncrActual()) actual_usage_steam << _("Encr") << " "; + if (mKey.CanCertActual()) actual_usage_steam << _("Certificate") << " "; + if (mKey.CanEncrActual()) actual_usage_steam << _("Encrypt") << " "; if (mKey.CanSignActual()) actual_usage_steam << _("Sign") << " "; if (mKey.CanAuthActual()) actual_usage_steam << _("Auth") << " "; - actualUsageVarLabel->setText(actualUsage); + actualUsageVarLabel->setText(actual_usage_steam.str().c_str()); - QString keySizeVal, keyExpireVal, keyCreateTimeVal, keyAlgoVal; + std::string key_size_val, key_expire_val, key_create_time_val, key_algo_val, + key_last_update_val; - keySizeVal = QString::number(mKey.length()); + key_size_val = std::to_string(mKey.length()); if (to_time_t(boost::posix_time::ptime(mKey.expires())) == 0) { - keyExpireVal = _("Never Expire"); + expireVarLabel->setText(_("Never Expire")); } else { - keyExpireVal = - QString::fromStdString(boost::gregorian::to_iso_string(mKey.expires())); + expireVarLabel->setText(QLocale::system().toString( + QDateTime::fromTime_t(to_time_t(mKey.expires())))); } - keyAlgoVal = QString::fromStdString(mKey.pubkey_algo()); - keyCreateTimeVal = QString::fromStdString(to_iso_string(mKey.create_time())); + key_algo_val = mKey.pubkey_algo(); - keySizeVarLabel->setText(keySizeVal); - expireVarLabel->setText(keyExpireVal); - createdVarLabel->setText(keyCreateTimeVal); - algorithmVarLabel->setText(keyAlgoVal); + createdVarLabel->setText(QLocale::system().toString( + QDateTime::fromTime_t(to_time_t(mKey.create_time())))); + + if (to_time_t(boost::posix_time::ptime(mKey.last_update())) == 0) { + lastUpdateVarLabel->setText(_("No Data")); + } else { + lastUpdateVarLabel->setText(QLocale::system().toString( + QDateTime::fromTime_t(to_time_t(mKey.last_update())))); + } + keySizeVarLabel->setText(key_size_val.c_str()); + algorithmVarLabel->setText(key_algo_val.c_str()); fingerPrintVarLabel->setText(beautify_fingerprint(mKey.fpr()).c_str()); } diff --git a/src/ui/keypair_details/KeyPairDetailTab.h b/src/ui/keypair_details/KeyPairDetailTab.h index 534014e5..0791344c 100644 --- a/src/ui/keypair_details/KeyPairDetailTab.h +++ b/src/ui/keypair_details/KeyPairDetailTab.h @@ -77,12 +77,13 @@ class KeyPairDetailTab : public QWidget { QGroupBox* additionalUidBox; /** Groupbox containing information about additional uids */ - QLabel* nameVarLabel; /** Label containng the keys name */ - QLabel* emailVarLabel; /** Label containng the keys email */ - QLabel* commentVarLabel; /** Label containng the keys commment */ - QLabel* keySizeVarLabel; /** Label containng the keys keysize */ - QLabel* expireVarLabel; /** Label containng the keys expiration date */ - QLabel* createdVarLabel; /** Label containng the keys creation date */ + QLabel* nameVarLabel; /** Label containng the keys name */ + QLabel* emailVarLabel; /** Label containng the keys email */ + QLabel* commentVarLabel; /** Label containng the keys commment */ + QLabel* keySizeVarLabel; /** Label containng the keys keysize */ + QLabel* expireVarLabel; /** Label containng the keys expiration date */ + QLabel* createdVarLabel; /** Label containng the keys creation date */ + QLabel* lastUpdateVarLabel; QLabel* algorithmVarLabel; /** Label containng the keys algorithm */ QLabel* keyidVarLabel; /** Label containng the keys keyid */ QLabel* fingerPrintVarLabel; /** Label containng the keys fingerprint */ diff --git a/src/ui/keypair_details/KeyPairSubkeyTab.cpp b/src/ui/keypair_details/KeyPairSubkeyTab.cpp index 4458be50..93e07875 100644 --- a/src/ui/keypair_details/KeyPairSubkeyTab.cpp +++ b/src/ui/keypair_details/KeyPairSubkeyTab.cpp @@ -34,8 +34,8 @@ KeyPairSubkeyTab::KeyPairSubkeyTab(const std::string& key_id, QWidget* parent) createSubkeyList(); createSubkeyOperaMenu(); - listBox = new QGroupBox("Subkey List"); - detailBox = new QGroupBox("Detail of Selected Subkey"); + listBox = new QGroupBox(_("Subkey List")); + detailBox = new QGroupBox(_("Detail of Selected Subkey")); auto uidButtonsLayout = new QGridLayout(); @@ -90,7 +90,7 @@ KeyPairSubkeyTab::KeyPairSubkeyTab(const std::string& key_id, QWidget* parent) subkeyDetailLayout->addWidget(fingerPrintVarLabel, 7, 1); listBox->setLayout(subkeyListLayout); - listBox->setContentsMargins(0, 5, 0, 0); + listBox->setContentsMargins(0, 12, 0, 0); detailBox->setLayout(subkeyDetailLayout); baseLayout->addWidget(listBox); @@ -142,7 +142,7 @@ void KeyPairSubkeyTab::createSubkeyList() { } void KeyPairSubkeyTab::slotRefreshSubkeyList() { - LOG(INFO) << "KeyPairSubkeyTab::slotRefreshSubkeyList Called"; + LOG(INFO) << "Called"; int row = 0; subkeyList->setSelectionMode(QAbstractItemView::SingleSelection); @@ -212,11 +212,11 @@ void KeyPairSubkeyTab::slotRefreshSubkeyDetail() { boost::posix_time::to_time_t(boost::posix_time::ptime(subkey.expires())); expireVarLabel->setText( - subkey_time_t == 0 - ? _("Never Expires") - : QString::fromStdString(to_iso_string(subkey.expires()))); + subkey_time_t == 0 ? _("Never Expires") + : QLocale::system().toString(QDateTime::fromTime_t( + to_time_t(subkey.expires())))); if (subkey_time_t != 0 && - subkey.expires() < boost::posix_time::second_clock::local_time().date()) { + subkey.expires() < boost::posix_time::second_clock::local_time()) { auto paletteExpired = expireVarLabel->palette(); paletteExpired.setColor(expireVarLabel->foregroundRole(), Qt::red); expireVarLabel->setPalette(paletteExpired); @@ -227,18 +227,17 @@ void KeyPairSubkeyTab::slotRefreshSubkeyDetail() { } algorithmVarLabel->setText(QString::fromStdString(subkey.pubkey_algo())); - createdVarLabel->setText( - QString::fromStdString(to_iso_string(subkey.timestamp()))); + createdVarLabel->setText(QLocale::system().toString( + QDateTime::fromTime_t(to_time_t(subkey.timestamp())))); - QString usage; - QTextStream usage_steam(&usage); + std::stringstream usage_steam; - if (subkey.can_certify()) usage_steam << _("Cert") << " "; - if (subkey.can_encrypt()) usage_steam << _("Encr") << " "; + if (subkey.can_certify()) usage_steam << _("Certificate") << " "; + if (subkey.can_encrypt()) usage_steam << _("Encrypt") << " "; if (subkey.can_sign()) usage_steam << _("Sign") << " "; if (subkey.can_authenticate()) usage_steam << _("Auth") << " "; - usageVarLabel->setText(usage); + usageVarLabel->setText(usage_steam.str().c_str()); // Show the situation that master key not exists. masterKeyExistVarLabel->setText(subkey.secret() ? _("Exists") @@ -268,8 +267,7 @@ void KeyPairSubkeyTab::createSubkeyOperaMenu() { } void KeyPairSubkeyTab::slotEditSubkey() { - LOG(INFO) << "KeyPairSubkeyTab::slotEditSubkey Fpr" - << getSelectedSubkey().fpr(); + LOG(INFO) << "Fpr" << getSelectedSubkey().fpr(); auto dialog = new KeySetExpireDateDialog(mKey.id(), getSelectedSubkey().fpr(), this); diff --git a/src/ui/keypair_details/KeyPairSubkeyTab.h b/src/ui/keypair_details/KeyPairSubkeyTab.h index 018f6ddc..8922e723 100644 --- a/src/ui/keypair_details/KeyPairSubkeyTab.h +++ b/src/ui/keypair_details/KeyPairSubkeyTab.h @@ -54,12 +54,12 @@ class KeyPairSubkeyTab : public QWidget { QMenu* subkeyOperaMenu{}; - QLabel* keySizeVarLabel; /** Label containng the keys keysize */ - QLabel* expireVarLabel; /** Label containng the keys expiration date */ - QLabel* createdVarLabel; /** Label containng the keys creation date */ - QLabel* algorithmVarLabel; /** Label containng the keys algorithm */ - QLabel* keyidVarLabel; /** Label containng the keys keyid */ - QLabel* fingerPrintVarLabel; /** Label containng the keys fingerprint */ + QLabel* keySizeVarLabel; /** Label containing the keys key size */ + QLabel* expireVarLabel; /** Label containing the keys expiration date */ + QLabel* createdVarLabel; /** Label containing the keys creation date */ + QLabel* algorithmVarLabel; /** Label containing the keys algorithm */ + QLabel* keyidVarLabel; /** Label containing the keys keyid */ + QLabel* fingerPrintVarLabel; /** Label containing the keys fingerprint */ QLabel* usageVarLabel; QLabel* masterKeyExistVarLabel; diff --git a/src/ui/keypair_details/KeyPairUIDTab.cpp b/src/ui/keypair_details/KeyPairUIDTab.cpp index 11055df3..8a58b270 100644 --- a/src/ui/keypair_details/KeyPairUIDTab.cpp +++ b/src/ui/keypair_details/KeyPairUIDTab.cpp @@ -24,6 +24,8 @@ #include "ui/keypair_details/KeyPairUIDTab.h" +#include <boost/locale.hpp> + #include "gpg/function/GpgKeyGetter.h" #include "gpg/function/GpgKeyManager.h" #include "gpg/function/UidOperator.h" @@ -271,16 +273,19 @@ void KeyPairUIDTab::slotRefreshSigList() { sigList->setItem(sigRow, 2, tmp3); } - auto* tmp4 = new QTableWidgetItem(QString::fromStdString( - boost::gregorian::to_iso_string(sig.create_time()))); + std::stringstream ss; + ss << boost::locale::as::datetime << sig.create_time(); + auto* tmp4 = new QTableWidgetItem(ss.str().c_str()); sigList->setItem(sigRow, 3, tmp4); + ss.str(std::string()); + ss << boost::locale::as::datetime << sig.expire_time(); + auto* tmp5 = new QTableWidgetItem( boost::posix_time::to_time_t( boost::posix_time::ptime(sig.expire_time())) == 0 ? _("Never Expires") - : QString::fromStdString( - boost::gregorian::to_iso_string(sig.expire_time()))); + : ss.str().c_str()); tmp5->setTextAlignment(Qt::AlignCenter); sigList->setItem(sigRow, 4, tmp5); diff --git a/src/ui/keypair_details/KeySetExpireDateDialog.cpp b/src/ui/keypair_details/KeySetExpireDateDialog.cpp index d197a76b..a90a4e4b 100644 --- a/src/ui/keypair_details/KeySetExpireDateDialog.cpp +++ b/src/ui/keypair_details/KeySetExpireDateDialog.cpp @@ -48,19 +48,16 @@ KeySetExpireDateDialog::KeySetExpireDateDialog(const KeyId& key_id, } void KeySetExpireDateDialog::slotConfirm() { - LOG(INFO) << "KeySetExpireDateDialog::slotConfirm Called"; - - std::unique_ptr<boost::gregorian::date> expires = nullptr; + LOG(INFO) << "Called" + << this->dateTimeEdit->dateTime().toLocalTime().toTime_t(); + std::unique_ptr<boost::posix_time::ptime> expires = nullptr; if (this->nonExpiredCheck->checkState() == Qt::Unchecked) { - expires = std::make_unique<boost::gregorian::date>( + expires = std::make_unique<boost::posix_time::ptime>( boost::posix_time::from_time_t( - this->dateTimeEdit->dateTime().toTime_t()) - .date()); - LOG(INFO) << "KeySetExpireDateDialog::slotConfirm" << mKey.id() << mSubkey - << *expires; + this->dateTimeEdit->dateTime().toLocalTime().toTime_t())); + LOG(INFO) << "keyid" << mKey.id() << mSubkey << *expires; } else { - LOG(INFO) << "KeySetExpireDateDialog::slotConfirm" << mKey.id() << mSubkey - << "Non Expired"; + LOG(INFO) << "keyid" << mKey.id() << mSubkey << "Non Expired"; } auto err = GpgKeyOpera::GetInstance().SetExpire(mKey, mSubkey, expires); @@ -84,10 +81,15 @@ void KeySetExpireDateDialog::slotConfirm() { } void KeySetExpireDateDialog::init() { - QDateTime maxDateTime = QDateTime::currentDateTime().addYears(2); + QDateTime maxDateTime = + QDateTime::currentDateTime().toLocalTime().addYears(2); dateTimeEdit = new QDateTimeEdit(maxDateTime); + dateTimeEdit->setTimeSpec(Qt::TimeSpec::TimeZone); + LOG(INFO) << "timespec" << Qt::TimeSpec::TimeZone; + dateTimeEdit->setCalendarPopup(true); dateTimeEdit->setMinimumDateTime(QDateTime::currentDateTime().addSecs(1)); dateTimeEdit->setMaximumDateTime(maxDateTime); + nonExpiredCheck = new QCheckBox(); nonExpiredCheck->setTristate(false); confirmButton = new QPushButton(_("Confirm")); @@ -103,7 +105,7 @@ void KeySetExpireDateDialog::init() { connect(confirmButton, SIGNAL(clicked(bool)), this, SLOT(slotConfirm())); this->setLayout(gridLayout); - this->setWindowTitle("Edit Expire Datetime"); + this->setWindowTitle(_("Edit Expire Datetime")); this->setModal(true); this->setAttribute(Qt::WA_DeleteOnClose, true); diff --git a/src/ui/keypair_details/KeyUIDSignDialog.cpp b/src/ui/keypair_details/KeyUIDSignDialog.cpp index 78e4900c..d9592c56 100644 --- a/src/ui/keypair_details/KeyUIDSignDialog.cpp +++ b/src/ui/keypair_details/KeyUIDSignDialog.cpp @@ -97,20 +97,19 @@ KeyUIDSignDialog::KeyUIDSignDialog(const GpgKey& key, UIDArgsListPtr uid, } void KeyUIDSignDialog::slotSignKey(bool clicked) { - LOG(INFO) << "KeyUIDSignDialog::slotSignKey Called"; + LOG(INFO) << "Called"; // Set Signers auto key_ids = mKeyList->getChecked(); auto keys = GpgKeyGetter::GetInstance().GetKeys(key_ids); - LOG(INFO) << "KeyUIDSignDialog::slotSignKey Key Info Got"; - auto expires = std::make_unique<boost::gregorian::date>( - boost::posix_time::from_time_t(expiresEdit->dateTime().toTime_t()) - .date()); + LOG(INFO) << "Key Info Got"; + auto expires = std::make_unique<boost::posix_time::ptime>( + boost::posix_time::from_time_t(expiresEdit->dateTime().toTime_t())); - LOG(INFO) << "KeyUIDSignDialog::slotSignKey Sign Start"; + LOG(INFO) << "Sign Start"; for (const auto& uid : *mUids) { - LOG(INFO) << "KeyUIDSignDialog::slotSignKey Sign UID" << uid; + LOG(INFO) << "Sign UID" << uid; // Sign For mKey if (!GpgKeyManager::GetInstance().signKey(mKey, *keys, uid, expires)) { QMessageBox::critical( diff --git a/src/ui/main_window/MainWindowSlotFunction.cpp b/src/ui/main_window/MainWindowSlotFunction.cpp index f328c45a..f2b98be1 100644 --- a/src/ui/main_window/MainWindowSlotFunction.cpp +++ b/src/ui/main_window/MainWindowSlotFunction.cpp @@ -490,7 +490,7 @@ void MainWindow::refreshKeysFromKeyserver() { auto key_ids = mKeyList->getSelected(); if (key_ids->empty()) return; - auto* dialog = new KeyServerImportDialog(true, this); + auto* dialog = new KeyServerImportDialog(this); dialog->show(); dialog->slotImport(key_ids); } diff --git a/src/ui/main_window/MainWindowSlotUI.cpp b/src/ui/main_window/MainWindowSlotUI.cpp index 9a7c7b83..0c0204f4 100644 --- a/src/ui/main_window/MainWindowSlotUI.cpp +++ b/src/ui/main_window/MainWindowSlotUI.cpp @@ -28,10 +28,6 @@ namespace GpgFrontend::UI { -void MainWindow::slotAbout() { new AboutDialog(0, this); } - -void MainWindow::slotCheckUpdate() { new AboutDialog(2, this); } - void MainWindow::slotSetStatusBarText(const QString& text) { statusBar()->showMessage(text, 20000); } diff --git a/src/ui/main_window/MainWindowUI.cpp b/src/ui/main_window/MainWindowUI.cpp index 7ceaffa2..4499b9c8 100644 --- a/src/ui/main_window/MainWindowUI.cpp +++ b/src/ui/main_window/MainWindowUI.cpp @@ -254,7 +254,14 @@ void MainWindow::createActions() { aboutAct = new QAction(_("About"), this); aboutAct->setIcon(QIcon(":help.png")); aboutAct->setToolTip(_("Show the application's About box")); - connect(aboutAct, SIGNAL(triggered()), this, SLOT(slotAbout())); + connect(aboutAct, &QAction::triggered, this, + [=]() { new AboutDialog(0, this); }); + + translateAct = new QAction(_("Translate"), this); + translateAct->setIcon(QIcon(":help.png")); + translateAct->setToolTip(_("Information about translation")); + connect(translateAct, &QAction::triggered, this, + [=]() { new AboutDialog(1, this); }); /* * Check Update Menu @@ -262,7 +269,8 @@ void MainWindow::createActions() { checkUpdateAct = new QAction(_("Check for Updates"), this); checkUpdateAct->setIcon(QIcon(":help.png")); checkUpdateAct->setToolTip(_("Check for updates")); - connect(checkUpdateAct, SIGNAL(triggered()), this, SLOT(slotCheckUpdate())); + connect(checkUpdateAct, &QAction::triggered, this, + [=]() { new AboutDialog(2, this); }); startWizardAct = new QAction(_("Open Wizard"), this); startWizardAct->setToolTip(_("Open the wizard")); @@ -398,6 +406,7 @@ void MainWindow::createMenus() { helpMenu->addAction(startWizardAct); helpMenu->addSeparator(); helpMenu->addAction(checkUpdateAct); + helpMenu->addAction(translateAct); helpMenu->addAction(aboutAct); } @@ -410,7 +419,7 @@ void MainWindow::createToolBars() { fileToolBar->addAction(browserAct); viewMenu->addAction(fileToolBar->toggleViewAction()); - cryptToolBar = addToolBar(_("Crypt")); + cryptToolBar = addToolBar(_("Operations")); cryptToolBar->setObjectName("cryptToolBar"); cryptToolBar->addAction(encryptAct); cryptToolBar->addAction(encryptSignAct); diff --git a/src/ui/settings/GlobalSettingStation.h b/src/ui/settings/GlobalSettingStation.h index ef2c6a9a..07b904a8 100644 --- a/src/ui/settings/GlobalSettingStation.h +++ b/src/ui/settings/GlobalSettingStation.h @@ -51,6 +51,10 @@ class GlobalSettingStation : public QObject { return app_locale_path; } + [[nodiscard]] boost::filesystem::path GetResourceDir() const { + return app_resource_path; + } + void Sync() noexcept; private: @@ -66,8 +70,10 @@ class GlobalSettingStation : public QObject { boost::filesystem::path app_log_path = app_data_path / "logs"; // Program Data Location - boost::filesystem::path app_locale_path = - RESOURCE_DIR_BOOST_PATH(app_path) / "locales"; + boost::filesystem::path app_resource_path = RESOURCE_DIR_BOOST_PATH(app_path); + + // Program Data Location + boost::filesystem::path app_locale_path = app_resource_path / "locales"; // Program Configure Location boost::filesystem::path app_configure_path = diff --git a/src/ui/widgets/FilePage.cpp b/src/ui/widgets/FilePage.cpp index 073ccf6b..d031114a 100644 --- a/src/ui/widgets/FilePage.cpp +++ b/src/ui/widgets/FilePage.cpp @@ -79,6 +79,13 @@ FilePage::FilePage(QWidget* parent) : QWidget(parent) { pathEdit = new QLineEdit(); pathEdit->setText(dirModel->rootPath()); + pathEditCompleter = new QCompleter(this); + pathCompleteModel = new QStringListModel(); + pathEditCompleter->setModel(pathCompleteModel); + pathEditCompleter->setCaseSensitivity(Qt::CaseInsensitive); + pathEditCompleter->setCompletionMode(QCompleter::UnfilteredPopupCompletion); + pathEdit->setCompleter(pathEditCompleter); + auto* menuLayout = new QHBoxLayout(); menuLayout->addWidget(upLevelButton); menuLayout->setStretchFactor(upLevelButton, 1); @@ -104,6 +111,17 @@ FilePage::FilePage(QWidget* parent) : QWidget(parent) { connect(dirTreeView, &QTreeView::customContextMenuRequested, this, &FilePage::onCustomContextMenu); + connect(pathEdit, &QLineEdit::textChanged, [=]() { + auto dir = QDir(pathEdit->text()); + if (dir.isReadable()) { + auto dir_list = dir.entryInfoList(QDir::AllEntries); + QStringList paths; + for (int i = 1; i < dir_list.size(); i++) + paths.append(dir_list.at(i).filePath()); + pathCompleteModel->setStringList(paths); + } + }); + connect(this, &FilePage::signalRefreshInfoBoard, SignalStation::GetInstance(), &SignalStation::signalRefreshInfoBoard); } @@ -151,9 +169,11 @@ void FilePage::slotGoPath() { dirTreeView->resizeColumnToContents(i); } pathEdit->setText(mPath.generic_path().string().c_str()); + } else { - QMessageBox::critical(this, _("Error"), - _("The path is unprivileged or unreachable.")); + QMessageBox::critical( + this, _("Error"), + _("The path is not exists, unprivileged or unreachable.")); } emit pathChanged(mPath.string().c_str()); } @@ -178,8 +198,9 @@ void FilePage::createPopupMenu() { new QAction(QString(_("Verify")) + " " + _("(.sig .gpg .asc)"), this); connect(verifyItemAct, SIGNAL(triggered()), this, SLOT(slotVerifyItem())); - auto hashItemAct = new QAction(_("Calculate Hash"), this); - connect(hashItemAct, SIGNAL(triggered()), this, SLOT(slotCalculateHash())); + hashCalculateAct = new QAction(_("Calculate Hash"), this); + connect(hashCalculateAct, SIGNAL(triggered()), this, + SLOT(slotCalculateHash())); popUpMenu->addAction(openItemAct); popUpMenu->addAction(renameItemAct); @@ -190,7 +211,7 @@ void FilePage::createPopupMenu() { popUpMenu->addAction(signItemAct); popUpMenu->addAction(verifyItemAct); popUpMenu->addSeparator(); - popUpMenu->addAction(hashItemAct); + popUpMenu->addAction(hashCalculateAct); } void FilePage::onCustomContextMenu(const QPoint& point) { @@ -209,6 +230,7 @@ void FilePage::onCustomContextMenu(const QPoint& point) { (info.suffix() != "gpg" && info.suffix() != "sig")); verifyItemAct->setEnabled( info.isFile() && (info.suffix() == "sig" || info.suffix() == "gpg")); + hashCalculateAct->setEnabled(info.isFile() && info.isReadable()); popUpMenu->exec(dirTreeView->viewport()->mapToGlobal(point)); } @@ -308,7 +330,7 @@ void FilePage::slotCalculateHash() { if (info.isFile() && info.isReadable()) { std::stringstream ss; - ss << "[#] " << _("File Hash") << std::endl; + ss << "[#] " << _("File Hash Information") << std::endl; ss << " " << _("filename") << _(": ") << selectedPath.filename().string().c_str() << std::endl; @@ -323,21 +345,24 @@ void FilePage::slotCalculateHash() { hash_md5.addData(buffer); auto md5 = hash_md5.result().toHex().toStdString(); LOG(INFO) << "md5" << md5; - ss << " " << _("md5") << _(": ") << md5 << std::endl; + ss << " " + << "md5" << _(": ") << md5 << std::endl; auto hash_sha1 = QCryptographicHash(QCryptographicHash::Sha1); // sha1 hash_sha1.addData(buffer); auto sha1 = hash_sha1.result().toHex().toStdString(); LOG(INFO) << "sha1" << sha1; - ss << " " << _("sha1") << _(": ") << sha1 << std::endl; + ss << " " + << "sha1" << _(": ") << sha1 << std::endl; auto hash_sha256 = QCryptographicHash(QCryptographicHash::Sha256); // sha1 hash_sha256.addData(buffer); auto sha256 = hash_sha256.result().toHex().toStdString(); LOG(INFO) << "sha256" << sha256; - ss << " " << _("sha256") << _(": ") << sha256 << std::endl; + ss << " " + << "sha256" << _(": ") << sha256 << std::endl; ss << std::endl; diff --git a/src/ui/widgets/FilePage.h b/src/ui/widgets/FilePage.h index 8533aaac..2a9f5b57 100644 --- a/src/ui/widgets/FilePage.h +++ b/src/ui/widgets/FilePage.h @@ -54,7 +54,7 @@ class FilePage : public QWidget { void fileTreeViewItemDoubleClicked(const QModelIndex& index); void slotUpLevel(); - + void slotOpenItem(); void slotRenameItem(); void slotDeleteItem(); @@ -75,6 +75,8 @@ class FilePage : public QWidget { QFileSystemModel* dirModel; QTreeView* dirTreeView; QLineEdit* pathEdit; + QCompleter* pathEditCompleter; + QStringListModel* pathCompleteModel; // using boost path boost::filesystem::path mPath; @@ -89,7 +91,7 @@ class FilePage : public QWidget { QAction* decryptItemAct{}; QAction* signItemAct{}; QAction* verifyItemAct{}; - + QAction* hashCalculateAct{}; QWidget* firstParent; }; diff --git a/src/ui/widgets/InfoBoardWidget.cpp b/src/ui/widgets/InfoBoardWidget.cpp index 2409edd7..7b7ea38e 100644 --- a/src/ui/widgets/InfoBoardWidget.cpp +++ b/src/ui/widgets/InfoBoardWidget.cpp @@ -55,7 +55,7 @@ InfoBoardWidget::InfoBoardWidget(QWidget* parent, KeyList* keyList) actionButtonLayout->setContentsMargins(0, 0, 0, 0); actionButtonLayout->setSpacing(0); - auto* label = new QLabel(_("Board Actions")); + auto* label = new QLabel(_("Actions")); label->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum); label->setContentsMargins(0, 0, 0, 0); mButtonGroup = new QButtonGroup(this); diff --git a/src/ui/widgets/VerifyKeyDetailBox.cpp b/src/ui/widgets/VerifyKeyDetailBox.cpp index 3975ac93..3187e156 100644 --- a/src/ui/widgets/VerifyKeyDetailBox.cpp +++ b/src/ui/widgets/VerifyKeyDetailBox.cpp @@ -181,32 +181,31 @@ QGridLayout* VerifyKeyDetailBox::createKeyInfoGrid( grid->addWidget(new QLabel(_("NOT Fully Valid")), 3, 1); } - QString flags; - QTextStream textStream(&flags); + std::stringstream text_stream; if (signature.summary() & GPGME_SIGSUM_GREEN) { - textStream << _("Good") << " "; + text_stream << _("Good") << " "; } if (signature.summary() & GPGME_SIGSUM_RED) { - textStream << _("Bad") << " "; + text_stream << _("Bad") << " "; } if (signature.summary() & GPGME_SIGSUM_SIG_EXPIRED) { - textStream << _("Expired") << " "; + text_stream << _("Expired") << " "; } if (signature.summary() & GPGME_SIGSUM_KEY_MISSING) { - textStream << _("Missing Key") << " "; + text_stream << _("Missing Key") << " "; } if (signature.summary() & GPGME_SIGSUM_KEY_REVOKED) { - textStream << _("Revoked Key") << " "; + text_stream << _("Revoked Key") << " "; } if (signature.summary() & GPGME_SIGSUM_KEY_EXPIRED) { - textStream << _("Expired Key") << " "; + text_stream << _("Expired Key") << " "; } if (signature.summary() & GPGME_SIGSUM_CRL_MISSING) { - textStream << _("Missing CRL") << " "; + text_stream << _("Missing CRL") << " "; } - grid->addWidget(new QLabel(flags.toStdString().c_str()), 4, 1); + grid->addWidget(new QLabel(text_stream.str().c_str()), 4, 1); return grid; } |