diff options
89 files changed, 2165 insertions, 2076 deletions
diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml index 5c541fbd..0be5e6ec 100644 --- a/.github/workflows/debug.yml +++ b/.github/workflows/debug.yml @@ -30,6 +30,8 @@ jobs: steps: - uses: actions/checkout@v2 + with: + submodules: recursive - name: Install Dependence (Linux) run: | @@ -41,7 +43,6 @@ jobs: - name: Git Sumbodule Update run: | - git pull --recurse-submodules git submodule update --init --recursive - name: Codesign Configuration (macOS) @@ -111,14 +112,14 @@ jobs: cd ${{github.workspace}} if: matrix.os == 'ubuntu-latest' - - name: Build GpgME (Linux) + - name: Build GpgME (Linux & macOS) run: | cd ${{github.workspace}}/third_party/gpgme ./autogen.sh ./configure --enable-maintainer-mode --enable-static=yes --enable-languages=cpp && make -j2 sudo make install cd ${{github.workspace}} - if: matrix.os == 'ubuntu-latest' + if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest' - name: Build GpgME (Windows) shell: msys2 {0} diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml index 4abf5c0d..1609a9c5 100644 --- a/.github/workflows/release-ci.yml +++ b/.github/workflows/release-ci.yml @@ -30,6 +30,8 @@ jobs: steps: - uses: actions/checkout@v2 + with: + submodules: recursive - name: Install Dependence (Linux) run: | @@ -40,6 +42,10 @@ jobs: sudo apt-get -y install libgcrypt11-dev libnss3-dev libpci-dev libpulse-dev libudev-dev libxtst-dev gyp ninja-build sudo apt-get -y install libglu1-mesa-dev libfontconfig1-dev libx11-xcb-dev libicu-dev libxcb-image0 sudo apt-get -y install libglu1-mesa-dev libfontconfig1-dev libx11-xcb-dev libicu-dev libxcb-* + sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 8 + sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 8 + sudo update-alternatives --set gcc "/usr/bin/gcc-8" + sudo update-alternatives --set g++ "/usr/bin/g++-8" if: matrix.os == 'ubuntu-18.04' - name: Codesign Configuration (macOS) @@ -93,9 +99,7 @@ jobs: - name: Build gpg-error (Linux) run: | - cd ${{github.workspace}}/.. - git clone https://github.com/saturneric/libgpg-error - cd libgpg-error + cd ${{github.workspace}}/third_party/libgpg-error ./autogen.sh ./configure --enable-maintainer-mode --enable-static=yes && make -j2 sudo make install @@ -104,25 +108,21 @@ jobs: - name: Build assuan (Linux) run: | - cd ${{github.workspace}}/.. - git clone https://github.com/saturneric/libassuan - cd libassuan + cd ${{github.workspace}}/third_party/libassuan ./autogen.sh ./configure --enable-maintainer-mode --enable-static=yes && make -j2 sudo make install cd ${{github.workspace}} if: matrix.os == 'ubuntu-18.04' - - name: Build GpgME (Linux) + - name: Build GpgME (Linux & macOS) run: | - cd ${{github.workspace}}/.. - git clone https://github.com/saturneric/gpgme - cd gpgme + cd ${{github.workspace}}/third_party/gpgme ./autogen.sh ./configure --enable-maintainer-mode --enable-static=yes --enable-languages=cpp && make -j2 sudo make install cd ${{github.workspace}} - if: matrix.os == 'ubuntu-18.04' + if: matrix.os == 'ubuntu-18.04' || matrix.os == 'macos-latest' - name: Build GpgME (Windows) shell: msys2 {0} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 496e5e79..1231d9cd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -30,6 +30,8 @@ jobs: steps: - uses: actions/checkout@v2 + with: + submodules: recursive - name: Install Dependence (Linux) run: | @@ -97,9 +99,7 @@ jobs: - name: Build gpg-error (Linux) run: | - cd ${{github.workspace}}/.. - git clone https://github.com/saturneric/libgpg-error - cd libgpg-error + cd ${{github.workspace}}/third_party/libgpg-error ./autogen.sh ./configure --enable-maintainer-mode --enable-static=yes && make -j2 sudo make install @@ -108,25 +108,21 @@ jobs: - name: Build assuan (Linux) run: | - cd ${{github.workspace}}/.. - git clone https://github.com/saturneric/libassuan - cd libassuan + cd ${{github.workspace}}/third_party/libassuan ./autogen.sh ./configure --enable-maintainer-mode --enable-static=yes && make -j2 sudo make install cd ${{github.workspace}} if: matrix.os == 'ubuntu-18.04' - - name: Build GpgME (Linux) + - name: Build GpgME (Linux & macOS) run: | - cd ${{github.workspace}}/.. - git clone https://github.com/saturneric/gpgme - cd gpgme + cd ${{github.workspace}}/third_party/gpgme ./autogen.sh ./configure --enable-maintainer-mode --enable-static=yes --enable-languages=cpp && make -j2 sudo make install cd ${{github.workspace}} - if: matrix.os == 'ubuntu-18.04' + if: matrix.os == 'ubuntu-18.04' || matrix.os == 'macos-latest' - name: Build GpgME (Windows) shell: msys2 {0} diff --git a/CMakeLists.txt b/CMakeLists.txt index a3063d66..d9091340 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -255,6 +255,10 @@ elseif (STABLE_APPLICATION_BUILD) set(UI_CORE 1) set(APPLICATION_BUILD 1) set(BASIC_ENV_CONFIG 1) + # MULTI_LANG_SUPPORT now work only on Linux and macOS + if (LINUX OR APPLE) + set(MULTI_LANG_SUPPORT 1) + endif () elseif (TEST_BUILD) message(STATUS "Build Test Cases") 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/gpgfrontend.qrc b/gpgfrontend.qrc index 71513dbd..1f8953a6 100644 --- a/gpgfrontend.qrc +++ b/gpgfrontend.qrc @@ -25,7 +25,9 @@ <file alias="decrypted_verified.png">resource/icons/decrypted_verified.png</file> <file alias="exit.png">resource/icons/exit.png</file> <file alias="export_key_to_file.png">resource/icons/export_key_to_file.png</file> + <file alias="file.png">resource/icons/file.png</file> <file alias="fileencryption.png">resource/icons/fileencrytion.png</file> + <file alias="file-browser.png">resource/icons/file-browser.png</file> <file alias="fileopen.png">resource/icons/fileopen.png</file> <file alias="fileprint.png">resource/icons/fileprint.png</file> <file alias="filesave.png">resource/icons/filesave.png</file> @@ -33,6 +35,7 @@ <file alias="format-line-spacing-double.png">resource/icons/format-line-spacing-double.png</file> <file alias="format-line-spacing-normal.png">resource/icons/format-line-spacing-normal.png</file> <file alias="format-line-spacing-triple.png">resource/icons/format-line-spacing-triple.png</file> + <file alias="gpgfrontend.png">resource/icons/gpgfrontend.png</file> <file alias="importkey_editor.png">resource/icons/importkey_editor.png</file> <file alias="import_key_from_clipboard.png">resource/icons/import_key_from_clipboard.png</file> <file alias="import_key_from_file.png">resource/icons/import_key_from_file.png</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/resource/gpgfrontend/usr/share/icons/hicolor/32x32/apps/GpgFrontend.png b/resource/gpgfrontend/usr/share/icons/hicolor/32x32/apps/GpgFrontend.png Binary files differnew file mode 100644 index 00000000..c90e1d1d --- /dev/null +++ b/resource/gpgfrontend/usr/share/icons/hicolor/32x32/apps/GpgFrontend.png diff --git a/resource/icons/file-browser.png b/resource/icons/file-browser.png Binary files differnew file mode 100644 index 00000000..29dba7e1 --- /dev/null +++ b/resource/icons/file-browser.png diff --git a/resource/icons/file.png b/resource/icons/file.png Binary files differnew file mode 100644 index 00000000..d8562029 --- /dev/null +++ b/resource/icons/file.png diff --git a/resource/icons/gpgfrontend.png b/resource/icons/gpgfrontend.png Binary files differnew file mode 100644 index 00000000..c90e1d1d --- /dev/null +++ b/resource/icons/gpgfrontend.png diff --git a/resource/icons/verify.png b/resource/icons/verify.png Binary files differindex bfaa5536..e359b69f 100644 --- a/resource/icons/verify.png +++ b/resource/icons/verify.png 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/GpgConstants.cpp b/src/gpg/GpgConstants.cpp index 5688287e..e3de1d06 100644 --- a/src/gpg/GpgConstants.cpp +++ b/src/gpg/GpgConstants.cpp @@ -77,12 +77,15 @@ gpgme_error_t GpgFrontend::check_gpg_error(gpgme_error_t err, std::string GpgFrontend::beautify_fingerprint( GpgFrontend::BypeArrayConstRef fingerprint) { - auto _fingerprint = fingerprint; - unsigned len = fingerprint.size(); - if ((len > 0) && (len % 4 == 0)) - for (unsigned n = 0; 4 * (n + 1) < len; ++n) - _fingerprint.insert(static_cast<int>(5u * n + 4u), " "); - return fingerprint; + auto len = fingerprint.size(); + std::stringstream out; + decltype(len) count = 0; + while (count < len) { + if (count && !(count % 5)) out << " "; + out << fingerprint[count]; + count++; + } + return out.str(); } // trim from start (in place) diff --git a/src/gpg/GpgContext.cpp b/src/gpg/GpgContext.cpp index 5d901c3f..a8b86619 100644 --- a/src/gpg/GpgContext.cpp +++ b/src/gpg/GpgContext.cpp @@ -51,7 +51,7 @@ GpgContext::GpgContext(bool independent_database, std::string db_path, if (_first) { /* Initialize the locale environment. */ - setlocale(LC_ALL, ""); + LOG(INFO) << "locale" << setlocale(LC_CTYPE, nullptr); gpgme_check_version(nullptr); gpgme_set_locale(nullptr, LC_CTYPE, setlocale(LC_CTYPE, nullptr)); #ifdef LC_MESSAGES @@ -76,7 +76,7 @@ GpgContext::GpgContext(bool independent_database, std::string db_path, if (engineInfo->protocol == GPGME_PROTOCOL_OpenPGP && strcmp(engineInfo->version, "1.0.0") != 0) find_openpgp = true, info.AppPath = engineInfo->file_name, - info.DatabasePath = "default"; + info.DatabasePath = "default", info.GnupgVersion = engineInfo->version; if (engineInfo->protocol == GPGME_PROTOCOL_CMS && strcmp(engineInfo->version, "1.0.0") != 0) find_cms = true; @@ -91,6 +91,8 @@ GpgContext::GpgContext(bool independent_database, std::string db_path, good_ = false; return; } else { + LOG(INFO) << "Gnupg Version" << info.GnupgVersion; + // Set Independent Database if (independent_database) { info.DatabasePath = db_path; 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/GpgInfo.h b/src/gpg/GpgInfo.h index 27e13112..6ecb9b92 100644 --- a/src/gpg/GpgInfo.h +++ b/src/gpg/GpgInfo.h @@ -38,6 +38,8 @@ class GpgInfo { std::string AppPath; std::string DatabasePath; + + std::string GnupgVersion; }; #endif // GPGFRONTEND_ZH_CN_TS_GPGINFO_H diff --git a/src/gpg/GpgModel.h b/src/gpg/GpgModel.h index 3e07427c..af094bf5 100644 --- a/src/gpg/GpgModel.h +++ b/src/gpg/GpgModel.h @@ -25,13 +25,13 @@ #ifndef GPGFRONTEND_ZH_CN_TS_GPGMODEL_H #define GPGFRONTEND_ZH_CN_TS_GPGMODEL_H -#include "GpgConstants.h" - #include <list> #include <utility> +#include "GpgConstants.h" #include "gpg/model/GpgData.h" #include "gpg/model/GpgKey.h" +#include "gpg/model/GpgSignature.h" namespace GpgFrontend { diff --git a/src/gpg/function/GpgKeyImportExportor.cpp b/src/gpg/function/GpgKeyImportExportor.cpp index f4b88c60..d8812839 100644 --- a/src/gpg/function/GpgKeyImportExportor.cpp +++ b/src/gpg/function/GpgKeyImportExportor.cpp @@ -33,11 +33,12 @@ */ GpgFrontend::GpgImportInformation GpgFrontend::GpgKeyImportExportor::ImportKey( StdBypeArrayPtr in_buffer) { - if (in_buffer->empty()) return GpgImportInformation(); + if (in_buffer->empty()) return {}; GpgData data_in(in_buffer->data(), in_buffer->size()); auto err = check_gpg_error(gpgme_op_import(ctx, data_in)); - assert(gpgme_err_code(err) == GPG_ERR_NO_ERROR); + if (gpgme_err_code(err) != GPG_ERR_NO_ERROR) return {}; + gpgme_import_result_t result; result = gpgme_op_import_result(ctx); gpgme_import_status_t status = result->imports; @@ -49,6 +50,7 @@ GpgFrontend::GpgImportInformation GpgFrontend::GpgKeyImportExportor::ImportKey( import_info->importedKeys.emplace_back(key); status = status->next; } + return *import_info; } @@ -64,11 +66,11 @@ bool GpgFrontend::GpgKeyImportExportor::ExportKeys( // Alleviate another crash problem caused by an unknown array out-of-bounds // access + auto all_success = true; for (size_t i = 0; i < uid_list->size(); i++) { GpgData data_out; auto err = gpgme_op_export(ctx, (*uid_list)[i].c_str(), 0, data_out); - assert(gpgme_err_code(err) == GPG_ERR_NO_ERROR); - + if (gpgme_err_code(err) != GPG_ERR_NO_ERROR) all_success = false; DLOG(INFO) << "exportKeys read_bytes" << gpgme_data_seek(data_out, 0, SEEK_END); @@ -76,7 +78,7 @@ bool GpgFrontend::GpgKeyImportExportor::ExportKeys( std::swap(out_buffer, temp_out_buffer); } - return true; + return all_success; } /** @@ -105,7 +107,6 @@ bool GpgFrontend::GpgKeyImportExportor::ExportSecretKey( gpgme_key_t target_key[2] = {gpgme_key_t(key), nullptr}; GpgData data_out; - // export private key to outBuffer gpgme_error_t err = gpgme_op_export_keys(ctx, target_key, GPGME_EXPORT_MODE_SECRET, data_out); @@ -115,3 +116,17 @@ bool GpgFrontend::GpgKeyImportExportor::ExportSecretKey( return check_gpg_error_2_err_code(err) == GPG_ERR_NO_ERROR; } + +bool GpgFrontend::GpgKeyImportExportor::ExportKey( + const GpgFrontend::GpgKey& key, + GpgFrontend::ByteArrayPtr& out_buffer) const { + GpgData data_out; + auto err = gpgme_op_export(ctx, key.id().c_str(), 0, data_out); + + DLOG(INFO) << "exportKeys read_bytes" + << gpgme_data_seek(data_out, 0, SEEK_END); + + auto temp_out_buffer = data_out.Read2Buffer(); + std::swap(out_buffer, temp_out_buffer); + return check_gpg_error_2_err_code(err) == GPG_ERR_NO_ERROR; +} diff --git a/src/gpg/function/GpgKeyImportExportor.h b/src/gpg/function/GpgKeyImportExportor.h index bceb87ef..35a237ba 100644 --- a/src/gpg/function/GpgKeyImportExportor.h +++ b/src/gpg/function/GpgKeyImportExportor.h @@ -88,6 +88,8 @@ class GpgKeyImportExportor bool ExportKeys(const KeyArgsList& keys, ByteArrayPtr& outBuffer) const; + bool ExportKey(const GpgKey& key, ByteArrayPtr& out_buffer) const; + bool ExportSecretKey(const GpgKey& key, ByteArrayPtr& outBuffer) const; private: 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 c60f9157..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()) @@ -214,4 +216,23 @@ GpgFrontend::GpgError GpgFrontend::GpgKeyOpera::GenerateSubkey( auto err = gpgme_op_createsubkey(ctx, gpgme_key_t(key), algo, 0, expires, flags); return check_gpg_error(err); -}
\ No newline at end of file +} + +GpgFrontend::GpgError GpgFrontend::GpgKeyOpera::ModifyPassword( + const GpgFrontend::GpgKey& key) { + if (ctx.GetInfo().GnupgVersion < "2.0.15") { + LOG(ERROR) << _("operator not support"); + return GPG_ERR_NOT_SUPPORTED; + } + auto err = gpgme_op_passwd(ctx, gpgme_key_t(key), 0); + return check_gpg_error(err); +} +GpgFrontend::GpgError GpgFrontend::GpgKeyOpera::ModifyTOFUPolicy( + const GpgFrontend::GpgKey& key, gpgme_tofu_policy_t tofu_policy) { + if (ctx.GetInfo().GnupgVersion < "2.1.10") { + LOG(ERROR) << _("operator not support"); + return GPG_ERR_NOT_SUPPORTED; + } + auto err = gpgme_op_tofu_policy(ctx, gpgme_key_t(key), tofu_policy); + return check_gpg_error(err); +} diff --git a/src/gpg/function/GpgKeyOpera.h b/src/gpg/function/GpgKeyOpera.h index 71e2de8b..7decfd79 100644 --- a/src/gpg/function/GpgKeyOpera.h +++ b/src/gpg/function/GpgKeyOpera.h @@ -36,11 +36,16 @@ 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); + GpgFrontend::GpgError ModifyPassword(const GpgKey& key); + + GpgFrontend::GpgError ModifyTOFUPolicy(const GpgKey& key, + gpgme_tofu_policy_t tofu_policy); + GpgFrontend::GpgError GenerateKey(const std::unique_ptr<GenKeyInfo>& params); GpgFrontend::GpgError GenerateSubkey( 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.cpp b/src/gpg/model/GpgSignature.cpp new file mode 100644 index 00000000..c8509edf --- /dev/null +++ b/src/gpg/model/GpgSignature.cpp @@ -0,0 +1,28 @@ +/** + * This file is part of GpgFrontend. + * + * GpgFrontend 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. + * + * Foobar 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 Foobar. If not, see <https://www.gnu.org/licenses/>. + * + * The initial version of the source code is inherited from gpg4usb-team. + * Their source code version also complies with GNU General Public License. + * + * The source code version of this software was modified and released + * by Saturneric<[email protected]> starting on May 12, 2021. + * + */ + +#include "GpgSignature.h" + +GpgFrontend::GpgSignature::GpgSignature(gpgme_signature_t sig) + : _signature_ref(sig, [&](gpgme_signature_t signature) {}) {} diff --git a/src/gpg/model/GpgSignature.h b/src/gpg/model/GpgSignature.h new file mode 100644 index 00000000..419bf9cf --- /dev/null +++ b/src/gpg/model/GpgSignature.h @@ -0,0 +1,86 @@ +/** + * This file is part of GpgFrontend. + * + * GpgFrontend 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. + * + * Foobar 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 Foobar. If not, see <https://www.gnu.org/licenses/>. + * + * The initial version of the source code is inherited from gpg4usb-team. + * Their source code version also complies with GNU General Public License. + * + * The source code version of this software was modified and released + * by Saturneric<[email protected]> starting on May 12, 2021. + * + */ + +#ifndef GPGFRONTEND_GPGSIGNATURE_H +#define GPGFRONTEND_GPGSIGNATURE_H + +#include <boost/date_time/gregorian/greg_date.hpp> +#include <boost/date_time/posix_time/conversion.hpp> + +#include "gpg/GpgConstants.h" + +namespace GpgFrontend { +class GpgSignature { + public: + [[nodiscard]] gpgme_validity_t validity() const { + return _signature_ref->validity; + } + + [[nodiscard]] gpgme_error_t status() const { return _signature_ref->status; } + + [[nodiscard]] gpgme_error_t summary() const { + return _signature_ref->summary; + } + + [[nodiscard]] std::string pubkey_algo() const { + return gpgme_pubkey_algo_name(_signature_ref->pubkey_algo); + } + + [[nodiscard]] std::string hash_algo() const { + return gpgme_hash_algo_name(_signature_ref->hash_algo); + } + + [[nodiscard]] boost::posix_time::ptime create_time() const { + return boost::posix_time::from_time_t(_signature_ref->timestamp); + } + [[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; } + + GpgSignature() = default; + + ~GpgSignature() = default; + + explicit GpgSignature(gpgme_signature_t sig); + + GpgSignature(GpgSignature &&) noexcept = default; + + GpgSignature(const GpgSignature &) = delete; + + GpgSignature &operator=(GpgSignature &&) noexcept = default; + + GpgSignature &operator=(const GpgSignature &) = delete; + + private: + using KeySignatrueRefHandler = + std::unique_ptr<struct _gpgme_signature, + std::function<void(gpgme_signature_t)>>; + + KeySignatrueRefHandler _signature_ref = nullptr; +}; +} // namespace GpgFrontend + +#endif // GPGFRONTEND_GPGSIGNATURE_H diff --git a/src/gpg/model/GpgSubKey.h b/src/gpg/model/GpgSubKey.h index 5f65c507..462dcbca 100644 --- a/src/gpg/model/GpgSubKey.h +++ b/src/gpg/model/GpgSubKey.h @@ -21,6 +21,7 @@ * by Saturneric<[email protected]> starting on May 12, 2021. * */ + #ifndef GPGFRONTEND_GPGSUBKEY_H #define GPGFRONTEND_GPGSUBKEY_H @@ -65,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/gpg/model/GpgTOFUInfo.cpp b/src/gpg/model/GpgTOFUInfo.cpp new file mode 100644 index 00000000..0f18a1c2 --- /dev/null +++ b/src/gpg/model/GpgTOFUInfo.cpp @@ -0,0 +1,28 @@ +/** + * This file is part of GpgFrontend. + * + * GpgFrontend 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. + * + * Foobar 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 Foobar. If not, see <https://www.gnu.org/licenses/>. + * + * The initial version of the source code is inherited from gpg4usb-team. + * Their source code version also complies with GNU General Public License. + * + * The source code version of this software was modified and released + * by Saturneric<[email protected]> starting on May 12, 2021. + * + */ + +#include "GpgTOFUInfo.h" + +GpgFrontend::GpgTOFUInfo::GpgTOFUInfo(gpgme_tofu_info_t tofu_info) + : _tofu_info_ref(tofu_info, [&](gpgme_tofu_info_t tofu_info) {}) {} diff --git a/src/gpg/model/GpgTOFUInfo.h b/src/gpg/model/GpgTOFUInfo.h new file mode 100644 index 00000000..3d1e379d --- /dev/null +++ b/src/gpg/model/GpgTOFUInfo.h @@ -0,0 +1,89 @@ +/** + * This file is part of GpgFrontend. + * + * GpgFrontend 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. + * + * Foobar 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 Foobar. If not, see <https://www.gnu.org/licenses/>. + * + * The initial version of the source code is inherited from gpg4usb-team. + * Their source code version also complies with GNU General Public License. + * + * The source code version of this software was modified and released + * by Saturneric<[email protected]> starting on May 12, 2021. + * + */ + +#ifndef GPGFRONTEND_GPGTOFU_H +#define GPGFRONTEND_GPGTOFU_H + +#include "gpg/GpgConstants.h" + +namespace GpgFrontend { + +class GpgTOFUInfo { + public: + [[nodiscard]] unsigned validity() const { return _tofu_info_ref->validity; } + + [[nodiscard]] unsigned policy() const { return _tofu_info_ref->policy; } + + [[nodiscard]] unsigned long sign_count() const { + return _tofu_info_ref->signcount; + } + + [[nodiscard]] unsigned long encr_count() const { + return _tofu_info_ref->encrcount; + } + + [[nodiscard]] unsigned long sign_first() const { + return _tofu_info_ref->signfirst; + } + + [[nodiscard]] unsigned long sign_last() const { + return _tofu_info_ref->signlast; + } + + [[nodiscard]] unsigned long encr_last() const { + return _tofu_info_ref->encrlast; + } + + [[nodiscard]] std::string description() const { + return _tofu_info_ref->description; + } + + GpgTOFUInfo() = default; + + explicit GpgTOFUInfo(gpgme_tofu_info_t tofu_info); + + GpgTOFUInfo(GpgTOFUInfo&& o) noexcept { + swap(_tofu_info_ref, o._tofu_info_ref); + } + + GpgTOFUInfo(const GpgTOFUInfo&) = delete; + + GpgTOFUInfo& operator=(GpgTOFUInfo&& o) noexcept { + swap(_tofu_info_ref, o._tofu_info_ref); + return *this; + }; + + GpgTOFUInfo& operator=(const GpgTOFUInfo&) = delete; + + private: + using SubkeyRefHandler = + std::unique_ptr<struct _gpgme_tofu_info, + std::function<void(gpgme_tofu_info_t)>>; + + SubkeyRefHandler _tofu_info_ref = nullptr; +}; + +} // namespace GpgFrontend + +#endif // GPGFRONTEND_GPGTOFU_H diff --git a/src/gpg/model/GpgUID.h b/src/gpg/model/GpgUID.h index 66dba321..8cac4cf7 100644 --- a/src/gpg/model/GpgUID.h +++ b/src/gpg/model/GpgUID.h @@ -26,6 +26,7 @@ #define GPGFRONTEND_GPGUID_H #include "GpgKeySignature.h" +#include "GpgTOFUInfo.h" namespace GpgFrontend { @@ -43,6 +44,16 @@ class GpgUID { [[nodiscard]] bool invalid() const { return _uid_ref->invalid; } + [[nodiscard]] std::unique_ptr<std::vector<GpgTOFUInfo>> tofu_infos() const { + auto infos = std::make_unique<std::vector<GpgTOFUInfo>>(); + auto info_next = _uid_ref->tofu; + while (info_next != nullptr) { + infos->push_back(GpgTOFUInfo(info_next)); + info_next = info_next->next; + } + return infos; + } + [[nodiscard]] std::unique_ptr<std::vector<GpgKeySignature>> signatures() const { auto sigs = std::make_unique<std::vector<GpgKeySignature>>(); diff --git a/src/gpg/result_analyse/SignResultAnalyse.cpp b/src/gpg/result_analyse/SignResultAnalyse.cpp index 770594ca..a65c4a9d 100644 --- a/src/gpg/result_analyse/SignResultAnalyse.cpp +++ b/src/gpg/result_analyse/SignResultAnalyse.cpp @@ -76,8 +76,9 @@ void GpgFrontend::SignResultAnalyse::do_analyse() { << gpgme_pubkey_algo_name(new_sign->pubkey_algo) << std::endl; stream << " " << _("Hash Algo") << ": " << gpgme_hash_algo_name(new_sign->hash_algo) << std::endl; - stream << " " << _("Date & Time") << ": " - << boost::posix_time::to_iso_string( + stream << " " << _("Date") << "(" << _("UTC") << ")" + << ": " + << boost::posix_time::to_iso_extended_string( boost::posix_time::from_time_t(new_sign->timestamp)) << std::endl; diff --git a/src/gpg/result_analyse/VerifyResultAnalyse.cpp b/src/gpg/result_analyse/VerifyResultAnalyse.cpp index 55e50f38..8f565b8e 100644 --- a/src/gpg/result_analyse/VerifyResultAnalyse.cpp +++ b/src/gpg/result_analyse/VerifyResultAnalyse.cpp @@ -24,6 +24,8 @@ #include "gpg/result_analyse/VerifyResultAnalyse.h" +#include <boost/format.hpp> + #include "GpgFrontend.h" #include "gpg/GpgConstants.h" #include "gpg/function/GpgKeyGetter.h" @@ -54,19 +56,24 @@ void GpgFrontend::VerifyResultAnalyse::do_analyse() { return; } - stream << "[>] " << _("Signed On") << " " - << boost::posix_time::to_iso_string( + stream << "[>] " << _("Signed On") << "(" << _("UTC") << ")" + << " " + << boost::posix_time::to_iso_extended_string( boost::posix_time::from_time_t(sign->timestamp)) << std::endl; - stream << std::endl << "[>] " << _("Signatures") << ":" << std::endl; + stream << std::endl << "[>] " << _("Signatures List") << ":" << std::endl; bool canContinue = true; + int count = 1; while (sign && canContinue) { + stream << boost::format(_("Signature [%1%]:")) % count++ << std::endl; switch (gpg_err_code(sign->status)) { case GPG_ERR_BAD_SIGNATURE: - stream << _("One or More Bad Signatures.") << std::endl; + stream << _("A Bad Signature.") << std::endl; + print_signer(stream, sign); + stream << _("This Signature is invalid.") << std::endl; canContinue = false; setStatus(-1); break; @@ -173,21 +180,29 @@ bool GpgFrontend::VerifyResultAnalyse::print_signer(std::stringstream &stream, stream << " " << _("Signed By") << ": " << key.uids()->front().uid() << std::endl; } - stream << " " << _("Public Key Algo") << ": " - << gpgme_pubkey_algo_name(sign->pubkey_algo) << std::endl; - stream << " " << _("Hash Algo") << ": " - << gpgme_hash_algo_name(sign->hash_algo) << std::endl; - stream << " " << _("Date & Time") << ": " - << boost::posix_time::to_iso_string( - boost::posix_time::from_time_t(sign->timestamp)) - << std::endl; + if (sign->pubkey_algo) + stream << " " << _("Public Key Algo") << ": " + << gpgme_pubkey_algo_name(sign->pubkey_algo) << std::endl; + if (sign->hash_algo) + stream << " " << _("Hash Algo") << ": " + << gpgme_hash_algo_name(sign->hash_algo) << std::endl; + if (sign->timestamp) + stream << " " << _("Date") << "(" << _("UTC") << ")" + << ": " + << boost::posix_time::to_iso_extended_string( + boost::posix_time::from_time_t(sign->timestamp)) + << std::endl; stream << std::endl; return keyFound; } -gpgme_signature_t GpgFrontend::VerifyResultAnalyse::GetSignatures() { +gpgme_signature_t GpgFrontend::VerifyResultAnalyse::GetSignatures() const { if (result) return result->signatures; else return nullptr; } +GpgFrontend::GpgVerifyResult +GpgFrontend::VerifyResultAnalyse::TakeChargeOfResult() { + return std::move(result); +} diff --git a/src/gpg/result_analyse/VerifyResultAnalyse.h b/src/gpg/result_analyse/VerifyResultAnalyse.h index 51ce17ac..8bf75f85 100644 --- a/src/gpg/result_analyse/VerifyResultAnalyse.h +++ b/src/gpg/result_analyse/VerifyResultAnalyse.h @@ -34,7 +34,9 @@ class VerifyResultAnalyse : public ResultAnalyse { public: explicit VerifyResultAnalyse(GpgError error, GpgVerifyResult result); - gpgme_signature_t GetSignatures(); + gpgme_signature_t GetSignatures() const; + + GpgVerifyResult TakeChargeOfResult(); private: void do_analyse(); diff --git a/src/main.cpp b/src/main.cpp index ee542ff0..f4739767 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -22,6 +22,8 @@ * */ +#include <cstdlib> + #include "GpgFrontendBuildInfo.h" #include "ui/MainWindow.h" #include "ui/settings/GlobalSettingStation.h" @@ -38,13 +40,11 @@ int main(int argc, char* argv[]) { // Qt App QApplication app(argc, argv); + QApplication::setWindowIcon(QIcon(":gpgfrontend.png")); // logging system init_logging(); - // i18n - init_locale(); - // App config QApplication::setApplicationVersion(BUILD_VERSION); QApplication::setApplicationName(PROJECT_NAME); @@ -65,25 +65,16 @@ int main(int argc, char* argv[]) { #endif /** - * internationalisation. loop to restart mainwindow + * internationalisation. loop to restart main window * with changed translation when settings change. */ int return_from_event_loop_code; do { - QApplication::setQuitOnLastWindowClosed(true); - - /** - * The function `gpgme_check_version' must be called before any other - * function in the library, because it initializes the thread support - * subsystem in GPGME. (from the info page) */ - gpgme_check_version(nullptr); + // i18n + init_locale(); - /** set locale, because tests do also */ - gpgme_set_locale(nullptr, LC_CTYPE, setlocale(LC_CTYPE, nullptr)); -#ifndef _WIN32 - gpgme_set_locale(nullptr, LC_MESSAGES, setlocale(LC_MESSAGES, nullptr)); -#endif + QApplication::setQuitOnLastWindowClosed(true); auto main_window = std::make_unique<GpgFrontend::UI::MainWindow>(); main_window->init(); @@ -136,8 +127,7 @@ void init_locale() { GpgFrontend::UI::GlobalSettingStation::GetInstance().Sync(); - auto* locale_name = setlocale(LC_ALL, nullptr); - LOG(INFO) << "current system locale" << locale_name; + LOG(INFO) << "current system locale" << setlocale(LC_ALL, nullptr); // read from settings file std::string lang; @@ -145,20 +135,29 @@ void init_locale() { LOG(ERROR) << _("Could not read properly from configure file"); }; - LOG(INFO) << "lang" << lang; + LOG(INFO) << "lang from settings" << lang; LOG(INFO) << "PROJECT_NAME" << PROJECT_NAME; LOG(INFO) << "locales path" << GpgFrontend::UI::GlobalSettingStation::GetInstance() .GetLocaleDir() .c_str(); - if (!lang.empty()) lang += ".UTF8"; - // GNU gettext settings - locale_name = setlocale(LC_ALL, lang.c_str()); - if (locale_name == nullptr) { - LOG(WARNING) << "set locale name failed"; - } else { - LOG(INFO) << "locale name now" << locale_name; + if (!lang.empty()) { + std::string lc = lang.empty() ? "" : lang + ".UTF-8"; + + // set LC_ALL + auto* locale_name = setlocale(LC_ALL, lc.c_str()); + if (locale_name == nullptr) LOG(WARNING) << "set LC_ALL failed" << lc; +#ifndef WINDOWS + auto language = getenv("LANGUAGE"); + // set LANGUAGE + std::string language_env = language == nullptr ? "en" : language; + language_env.insert(0, lang + ":"); + LOG(INFO) << "language env" << language_env; + if (setenv("LANGUAGE", language_env.c_str(), 1)) { + LOG(WARNING) << "set LANGUAGE failed" << language_env; + }; +#endif } bindtextdomain(PROJECT_NAME, diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt index b80da2ec..f4b00d22 100644 --- a/src/ui/CMakeLists.txt +++ b/src/ui/CMakeLists.txt @@ -6,6 +6,7 @@ aux_source_directory(./main_window UI_SOURCE) aux_source_directory(./help UI_SOURCE) aux_source_directory(./settings UI_SOURCE) aux_source_directory(./function UI_SOURCE) +aux_source_directory(./details UI_SOURCE) if (SMTP_SUPPORT) message(STATUS "Build SMTP Support") diff --git a/src/ui/FileEncryptionDialog.cpp b/src/ui/FileEncryptionDialog.cpp index 3e1e9b9a..aeba6497 100755 --- a/src/ui/FileEncryptionDialog.cpp +++ b/src/ui/FileEncryptionDialog.cpp @@ -86,32 +86,43 @@ FileEncryptionDialog::FileEncryptionDialog(KeyIdArgsListPtr keyList, groupBox1->setLayout(gLayout); /*Setup KeyList*/ - mKeyList = new KeyList( - KeyListRow::ONLY_SECRET_KEY, - KeyListColumn::NAME | KeyListColumn::EmailAddress | KeyListColumn::Usage); - if (mAction == Verify) - mKeyList->setFilter([](const GpgKey& key) -> bool { - if (key.disabled() || key.expired() || key.revoked()) - return false; - else - return true; - }); - - if (mAction == Encrypt) - mKeyList->setFilter([](const GpgKey& key) -> bool { - if (!key.CanEncrActual()) - return false; - else - return true; - }); - - if (mAction == Sign) - mKeyList->setFilter([](const GpgKey& key) -> bool { - if (!key.CanSignActual()) - return false; - else - return true; - }); + + if (mAction == Verify) { + mKeyList = + new KeyList(KeyListRow::ONLY_SECRET_KEY, + KeyListColumn::NAME | KeyListColumn::EmailAddress | + KeyListColumn::Usage, + [](const GpgKey& key) -> bool { + if (key.disabled() || key.expired() || key.revoked()) + return false; + else + return true; + }); + } + + if (mAction == Encrypt) { + mKeyList = new KeyList(KeyListRow::ONLY_SECRET_KEY, + KeyListColumn::NAME | KeyListColumn::EmailAddress | + KeyListColumn::Usage, + [](const GpgKey& key) -> bool { + if (!key.CanEncrActual()) + return false; + else + return true; + }); + } + + if (mAction == Encrypt) { + mKeyList = new KeyList(KeyListRow::ONLY_SECRET_KEY, + KeyListColumn::NAME | KeyListColumn::EmailAddress | + KeyListColumn::Usage, + [](const GpgKey& key) -> bool { + if (!key.CanSignActual()) + return false; + else + return true; + }); + } if (mAction == Decrypt) mKeyList->setDisabled(true); @@ -256,7 +267,7 @@ void FileEncryptionDialog::slotExecuteAction() { GpgVerifyResult result = nullptr; auto error = BasicOperator::GetInstance().Verify(in_data, sign_data, result); - new VerifyDetailsDialog(this, mKeyList, error, std::move(result)); + new VerifyDetailsDialog(this, error, std::move(result)); return; } diff --git a/src/ui/FileEncryptionDialog.h b/src/ui/FileEncryptionDialog.h index 613f84e7..b09bb8db 100755 --- a/src/ui/FileEncryptionDialog.h +++ b/src/ui/FileEncryptionDialog.h @@ -25,9 +25,9 @@ #ifndef __FILEENCRYPTIONDIALOG_H__ #define __FILEENCRYPTIONDIALOG_H__ -#include "VerifyDetailsDialog.h" #include "gpg/GpgContext.h" #include "ui/GpgFrontendUI.h" +#include "ui/details/VerifyDetailsDialog.h" #include "ui/widgets/KeyList.h" namespace GpgFrontend::UI { diff --git a/src/ui/KeyMgmt.cpp b/src/ui/KeyMgmt.cpp index 7459906d..aa6df120 100755 --- a/src/ui/KeyMgmt.cpp +++ b/src/ui/KeyMgmt.cpp @@ -36,9 +36,49 @@ namespace GpgFrontend::UI { KeyMgmt::KeyMgmt(QWidget* parent) : QMainWindow(parent) { /* the list of Keys available*/ - mKeyList = new KeyList(); - mKeyList->setColumnWidth(2, 250); - mKeyList->setColumnWidth(3, 250); + mKeyList = new KeyList(this); + + mKeyList->addListGroupTab(_("All"), KeyListRow::SECRET_OR_PUBLIC_KEY); + + mKeyList->addListGroupTab( + _("Only Public Key"), KeyListRow::SECRET_OR_PUBLIC_KEY, + KeyListColumn::TYPE | KeyListColumn::NAME | KeyListColumn::EmailAddress | + KeyListColumn::Usage | KeyListColumn::Validity, + [](const GpgKey& key) -> bool { + return !key.is_private_key() && + !(key.revoked() || key.disabled() || key.expired()); + }); + + mKeyList->addListGroupTab( + _("Has Private Key"), KeyListRow::SECRET_OR_PUBLIC_KEY, + KeyListColumn::TYPE | KeyListColumn::NAME | KeyListColumn::EmailAddress | + KeyListColumn::Usage | KeyListColumn::Validity, + [](const GpgKey& key) -> bool { + return key.is_private_key() && + !(key.revoked() || key.disabled() || key.expired()); + }); + + mKeyList->addListGroupTab( + _("No Master Key"), KeyListRow::SECRET_OR_PUBLIC_KEY, + KeyListColumn::TYPE | KeyListColumn::NAME | KeyListColumn::EmailAddress | + KeyListColumn::Usage | KeyListColumn::Validity, + [](const GpgKey& key) -> bool { + return !key.has_master_key() && + !(key.revoked() || key.disabled() || key.expired()); + }); + + mKeyList->addListGroupTab( + _("Revoked"), KeyListRow::SECRET_OR_PUBLIC_KEY, + KeyListColumn::TYPE | KeyListColumn::NAME | KeyListColumn::EmailAddress | + KeyListColumn::Usage | KeyListColumn::Validity, + [](const GpgKey& key) -> bool { return key.revoked(); }); + + mKeyList->addListGroupTab( + _("Expired"), KeyListRow::SECRET_OR_PUBLIC_KEY, + KeyListColumn::TYPE | KeyListColumn::NAME | KeyListColumn::EmailAddress | + KeyListColumn::Usage | KeyListColumn::Validity, + [](const GpgKey& key) -> bool { return key.expired(); }); + setCentralWidget(mKeyList); mKeyList->setDoubleClickedAction([this](const GpgKey& key, QWidget* parent) { new KeyDetailsDialog(key, parent); diff --git a/src/ui/KeyServerImportDialog.cpp b/src/ui/KeyServerImportDialog.cpp index 17db7d65..844f2ae5 100644 --- a/src/ui/KeyServerImportDialog.cpp +++ b/src/ui/KeyServerImportDialog.cpp @@ -196,7 +196,7 @@ void KeyServerImportDialog::createKeysTable() { void KeyServerImportDialog::setMessage(const QString& text, bool error) { if (mAutomatic) return; - + message->setText(text); if (error) { icon->setPixmap( @@ -505,12 +505,13 @@ void KeyServerImportDialog::importKeys(ByteArrayPtr in_data) { GpgImportInformation result = GpgKeyImportExportor::GetInstance().ImportKey(std::move(in_data)); emit signalKeyImported(); + QWidget* _parent = qobject_cast<QWidget*>(parent()); if (mAutomatic) { - auto dialog = new KeyImportDetailDialog(result, true, nullptr); + auto dialog = new KeyImportDetailDialog(result, true, _parent); dialog->show(); this->accept(); } else { - auto dialog = new KeyImportDetailDialog(result, false, this); + auto dialog = new KeyImportDetailDialog(result, false, _parent); dialog->exec(); } } @@ -527,34 +528,24 @@ KeyServerImportDialog::KeyServerImportDialog(QWidget* parent) : QDialog(parent), mAutomatic(true) { setWindowFlags(Qt::Window | Qt::WindowTitleHint | Qt::CustomizeWindowHint); - message = new QLabel; - message->setFixedHeight(24); - icon = new QLabel; - icon->setFixedHeight(24); - // Network Waiting waitingBar = new QProgressBar(); waitingBar->setVisible(false); waitingBar->setRange(0, 0); - waitingBar->setFixedHeight(24); - waitingBar->setFixedWidth(200); + waitingBar->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); + waitingBar->setTextVisible(false); // Layout for messagebox - auto* messageLayout = new QHBoxLayout; - messageLayout->addWidget(icon); - messageLayout->addWidget(message); - messageLayout->addWidget(waitingBar); - messageLayout->addStretch(); + auto* layout = new QHBoxLayout(); + layout->setContentsMargins(0, 0, 0, 0); + layout->setSpacing(0); + layout->addWidget(waitingBar); keyServerComboBox = createComboBox(); - auto* mainLayout = new QGridLayout; - - mainLayout->addLayout(messageLayout, 0, 0, 1, 3); - - this->setLayout(mainLayout); - this->setWindowTitle(_("Upload Keys from Keyserver")); - this->setFixedSize(200, 42); + this->setLayout(layout); + this->setWindowTitle(_("Update Keys from Keyserver")); + this->setFixedSize(240, 42); this->setModal(true); } diff --git a/src/ui/KeyServerImportDialog.h b/src/ui/KeyServerImportDialog.h index 67571f2f..508fb42d 100644 --- a/src/ui/KeyServerImportDialog.h +++ b/src/ui/KeyServerImportDialog.h @@ -38,7 +38,7 @@ class KeyServerImportDialog : public QDialog { public: KeyServerImportDialog(bool automatic, QWidget* parent); - KeyServerImportDialog(QWidget* parent); + explicit KeyServerImportDialog(QWidget* parent); void slotImport(const KeyIdArgsListPtr& keys); diff --git a/src/ui/KeyUploadDialog.cpp b/src/ui/KeyUploadDialog.cpp index b2bfff6d..52aa2bd3 100644 --- a/src/ui/KeyUploadDialog.cpp +++ b/src/ui/KeyUploadDialog.cpp @@ -28,15 +28,13 @@ #include "gpg/function/GpgKeyGetter.h" #include "gpg/function/GpgKeyImportExportor.h" +#include "ui/settings/GlobalSettingStation.h" namespace GpgFrontend::UI { KeyUploadDialog::KeyUploadDialog(const KeyIdArgsListPtr& keys_ids, QWidget* parent) : QDialog(parent), - appPath(qApp->applicationDirPath()), - settings(RESOURCE_DIR(appPath) + "/conf/gpgfrontend.ini", - QSettings::IniFormat), mKeys(GpgKeyGetter::GetInstance().GetKeys(keys_ids)) { auto* pb = new QProgressBar(); pb->setRange(0, 0); @@ -62,10 +60,27 @@ void KeyUploadDialog::slotUpload() { void KeyUploadDialog::uploadKeyToServer( const GpgFrontend::ByteArray& keys_data) { - // set default keyserver - QString keyserver = settings.value("keyserver/defaultKeyServer").toString(); - QUrl reqUrl(keyserver + "/pks/add"); + std::string target_keyserver; + if (target_keyserver.empty()) { + try { + auto& settings = GlobalSettingStation::GetInstance().GetUISettings(); + + target_keyserver = settings.lookup("keyserver.default_server").c_str(); + + LOG(INFO) << _("Set target Key Server to default Key Server") + << target_keyserver; + } catch (...) { + LOG(ERROR) << _("Cannot read default_keyserver From Settings"); + QMessageBox::critical( + nullptr, _("Default Keyserver Not Found"), + _("Cannot read default keyserver from your settings, " + "please set a default keyserver first")); + return; + } + } + + QUrl req_url(QString::fromStdString(target_keyserver + "/pks/add")); auto qnam = new QNetworkAccessManager(this); // Building Post Data @@ -83,7 +98,7 @@ void KeyUploadDialog::uploadKeyToServer( boost::algorithm::replace_all(data, "=", "%3D"); boost::algorithm::replace_all(data, " ", "+"); - QNetworkRequest request(reqUrl); + QNetworkRequest request(req_url); request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded"); @@ -108,11 +123,11 @@ void KeyUploadDialog::slotUploadFinished() { auto* reply = qobject_cast<QNetworkReply*>(sender()); QByteArray response = reply->readAll(); - qDebug() << "Response: " << response.data(); + LOG(INFO) << "Response: " << response.toStdString(); auto error = reply->error(); if (error != QNetworkReply::NoError) { - qDebug() << "Error From Reply" << reply->errorString(); + LOG(INFO) << "Error From Reply" << reply->errorString().toStdString(); QString message; switch (error) { case QNetworkReply::ContentNotFoundError: @@ -130,9 +145,9 @@ void KeyUploadDialog::slotUploadFinished() { QMessageBox::critical(this, "Upload Failed", message); return; } else { - QMessageBox::information(this, "Upload Success", - "Upload Public Key Successfully"); - qDebug() << "Success while contacting keyserver!"; + QMessageBox::information(this, _("Upload Success"), + _("Upload Public Key Successfully")); + LOG(INFO) << "Success while contacting keyserver!"; } reply->deleteLater(); } diff --git a/src/ui/KeyUploadDialog.h b/src/ui/KeyUploadDialog.h index b607c321..6f292d2b 100644 --- a/src/ui/KeyUploadDialog.h +++ b/src/ui/KeyUploadDialog.h @@ -46,8 +46,6 @@ class KeyUploadDialog : public QDialog { void slotUploadFinished(); private: - QString appPath; - QSettings settings; KeyListPtr mKeys; QByteArray mKeyData; }; diff --git a/src/ui/MainWindow.cpp b/src/ui/MainWindow.cpp index e29278e9..9aceed96 100644 --- a/src/ui/MainWindow.cpp +++ b/src/ui/MainWindow.cpp @@ -38,6 +38,7 @@ MainWindow::MainWindow() { } void MainWindow::init() noexcept { + LOG(INFO) << _("Called"); try { // Check Context Status if (!GpgContext::GetInstance().good()) { @@ -59,14 +60,7 @@ void MainWindow::init() noexcept { setCentralWidget(edit); /* the list of Keys available*/ - mKeyList = new KeyList(KeyListRow::SECRET_OR_PUBLIC_KEY, - KeyListColumn::TYPE | KeyListColumn::NAME | - KeyListColumn::EmailAddress | - KeyListColumn::Usage | KeyListColumn::Validity, - this); - mKeyList->setFilter([](const GpgKey& key) -> bool { - return !(key.revoked() || key.disabled() || key.expired()); - }); + mKeyList = new KeyList(this); mKeyList->slotRefresh(); @@ -144,7 +138,6 @@ void MainWindow::init() noexcept { &MainWindow::slotVersionUpgrade); version_thread->start(); - #endif } catch (...) { @@ -157,6 +150,8 @@ void MainWindow::init() noexcept { } void MainWindow::restoreSettings() { + LOG(INFO) << _("Called"); + try { auto& settings = GlobalSettingStation::GetInstance().GetUISettings(); @@ -244,7 +239,6 @@ void MainWindow::restoreSettings() { // icons ize this->setIconSize(QSize(width, height)); importButton->setIconSize(QSize(width, height)); - fileEncButton->setIconSize(QSize(width, height)); if (!settings.exists("keyserver") || settings.lookup("keyserver").getType() != libconfig::Setting::TypeGroup) @@ -279,7 +273,6 @@ void MainWindow::restoreSettings() { auto icon_style = static_cast<Qt::ToolButtonStyle>(s_icon_style); this->setToolButtonStyle(icon_style); importButton->setToolButtonStyle(icon_style); - fileEncButton->setToolButtonStyle(icon_style); if (!settings.exists("general") || settings.lookup("general").getType() != libconfig::Setting::TypeGroup) @@ -300,12 +293,12 @@ void MainWindow::restoreSettings() { general.add("save_key_checked_key_ids", libconfig::Setting::TypeList); } auto key_ids_ptr = std::make_unique<KeyIdArgsList>(); - ; auto& save_key_checked_key_ids = general["save_key_checked_key_ids"]; const auto key_ids_size = general.lookup("save_key_checked_key_ids").getLength(); for (auto i = 0; i < key_ids_size; i++) { std::string key_id = save_key_checked_key_ids[i]; + LOG(INFO) << "get checked key id" << key_id; key_ids_ptr->push_back(key_id); } mKeyList->setChecked(key_ids_ptr); diff --git a/src/ui/MainWindow.h b/src/ui/MainWindow.h index f4eb70a8..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(); @@ -361,8 +351,6 @@ class MainWindow : public QMainWindow { QToolBar* keyToolBar{}; /** Toolbar holding key operations */ QToolButton* importButton{}; /** Toolbutton for import dropdown menu in toolbar */ - QToolButton* fileEncButton{}; /** Toolbutton for file cryption dropdown menu - in toolbar */ QDockWidget* keyListDock{}; /** Encrypt Dock*/ QDockWidget* attachmentDock{}; /** Attachment Dock */ QDockWidget* infoBoardDock{}; @@ -404,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/SignalStation.cpp b/src/ui/SignalStation.cpp index fff2971a..0c550f88 100644 --- a/src/ui/SignalStation.cpp +++ b/src/ui/SignalStation.cpp @@ -24,6 +24,8 @@ #include "SignalStation.h" +namespace GpgFrontend::UI { + std::unique_ptr<SignalStation> SignalStation::_instance = nullptr; SignalStation* SignalStation::GetInstance() { @@ -32,3 +34,5 @@ SignalStation* SignalStation::GetInstance() { } return _instance.get(); } + +} // namespace GpgFrontend::UI diff --git a/src/ui/SignalStation.h b/src/ui/SignalStation.h index 38e55d9f..bfd5e197 100644 --- a/src/ui/SignalStation.h +++ b/src/ui/SignalStation.h @@ -26,6 +26,9 @@ #define GPGFRONTEND_SIGNALSTATION_H #include "ui/GpgFrontendUI.h" +#include "ui/widgets/InfoBoardWidget.h" + +namespace GpgFrontend::UI { class SignalStation : public QObject { Q_OBJECT @@ -36,6 +39,11 @@ class SignalStation : public QObject { signals: void KeyDatabaseRefresh(); + + void signalRefreshInfoBoard(const QString& text, + InfoBoardStatus verify_label_status); }; +} // namespace GpgFrontend::UI + #endif // GPGFRONTEND_SIGNALSTATION_H diff --git a/src/ui/UserInterfaceUtils.cpp b/src/ui/UserInterfaceUtils.cpp index e8f27d2c..3c10009a 100644 --- a/src/ui/UserInterfaceUtils.cpp +++ b/src/ui/UserInterfaceUtils.cpp @@ -35,6 +35,41 @@ namespace GpgFrontend::UI { std::unique_ptr<GpgFrontend::UI::CommonUtils> GpgFrontend::UI::CommonUtils::_instance = nullptr; +void show_verify_details(QWidget* parent, InfoBoardWidget* info_board, + GpgError error, VerifyResultAnalyse& verify_res) { + // take out result + auto _result = verify_res.TakeChargeOfResult(); + info_board->resetOptionActionsMenu(); + info_board->addOptionalAction( + "Show Verify Details", [parent, error, _result_ptr = _result.get()]() { + VerifyDetailsDialog(parent, error, GpgVerifyResult(_result_ptr)); + }); + _result.reset(nullptr); +} + +void import_unknown_key_from_keyserver(QWidget* parent, + const VerifyResultAnalyse& verify_res) { + QMessageBox::StandardButton reply; + reply = QMessageBox::question( + parent, _("Public key not found locally"), + _("There is no target public key content in local for GpgFrontend to " + "gather enough information about this Signature. Do you want to " + "import the public key from Keyserver now?"), + QMessageBox::Yes | QMessageBox::No); + if (reply == QMessageBox::Yes) { + auto dialog = KeyServerImportDialog(true, parent); + auto key_ids = std::make_unique<KeyIdArgsList>(); + auto* signature = verify_res.GetSignatures(); + while (signature != nullptr) { + LOG(INFO) << "signature fpr" << signature->fpr; + key_ids->push_back(signature->fpr); + signature = signature->next; + } + dialog.show(); + dialog.slotImport(key_ids); + } +} + void refresh_info_board(InfoBoardWidget* info_board, int status, const std::string& report_text) { if (status < 0) @@ -50,7 +85,6 @@ void refresh_info_board(InfoBoardWidget* info_board, int status, void process_result_analyse(TextEdit* edit, InfoBoardWidget* info_board, const ResultAnalyse& result_analyse) { info_board->associateTabWidget(edit->tabWidget); - info_board->associateFileTreeView(edit->curFilePage()); refresh_info_board(info_board, result_analyse.getStatus(), result_analyse.getResultReport()); } @@ -61,7 +95,6 @@ void process_result_analyse(TextEdit* edit, InfoBoardWidget* info_board, LOG(INFO) << "process_result_analyse Started"; info_board->associateTabWidget(edit->tabWidget); - info_board->associateFileTreeView(edit->curFilePage()); refresh_info_board( info_board, diff --git a/src/ui/UserInterfaceUtils.h b/src/ui/UserInterfaceUtils.h index df974257..7b05658f 100644 --- a/src/ui/UserInterfaceUtils.h +++ b/src/ui/UserInterfaceUtils.h @@ -25,6 +25,7 @@ #ifndef GPGFRONTEND_USER_INTERFACE_UTILS_H #define GPGFRONTEND_USER_INTERFACE_UTILS_H +#include "gpg/result_analyse/VerifyResultAnalyse.h" #include "ui/GpgFrontendUI.h" namespace GpgFrontend { @@ -36,6 +37,12 @@ namespace GpgFrontend::UI { class InfoBoardWidget; class TextEdit; +void show_verify_details(QWidget* parent, InfoBoardWidget* info_board, + GpgError error, VerifyResultAnalyse& verify_res); + +void import_unknown_key_from_keyserver(QWidget* parent, + const VerifyResultAnalyse& verify_res); + void refresh_info_board(InfoBoardWidget* info_board, int status, const std::string& report_text); diff --git a/src/ui/Wizard.cpp b/src/ui/Wizard.cpp index de0107c4..a8576627 100644 --- a/src/ui/Wizard.cpp +++ b/src/ui/Wizard.cpp @@ -104,73 +104,17 @@ IntroPage::IntroPage(QWidget* parent) : QWizardPage(parent) { "system, GpgFrontend will automatically set it.")); langLabel->setWordWrap(true); - languages = SettingsDialog::listLanguages(); - auto* langSelectBox = new QComboBox(); - - for (const auto& l : languages) { - langSelectBox->addItem(l); - } - // selected entry from config - - // auto lang = ""; - // auto& settings = GlobalSettingStation::GetInstance().GetUISettings(); - // try { - // lang = settings.lookup("general.lang"); - // } catch (...) { - // LOG(INFO) << "Read for general.lang failed"; - // } - // - // QString langKey = lang; - // QString langValue = languages.value(langKey); - // LOG(INFO) << "lang key" << langKey.toStdString() << "lang value" - // << langValue.toStdString(); - // langSelectBox->setCurrentIndex(langSelectBox->findText(langValue)); - - // connect(langSelectBox, SIGNAL(currentIndexChanged(QString)), this, - // SLOT(slotLangChange(QString))); - // set layout and add widgets auto* layout = new QVBoxLayout; layout->addWidget(topLabel); layout->addStretch(); +#ifdef MULTI_LANG_SUPPORT layout->addWidget(langLabel); - // layout->addWidget(langSelectBox); +#endif setLayout(layout); } -// void IntroPage::slotLangChange(const QString& lang) { -// auto& settings = GlobalSettingStation::GetInstance().GetUISettings(); -// -// if (!settings.exists("general") || -// settings.lookup("general").getType() != libconfig::Setting::TypeGroup) -// settings.add("general", libconfig::Setting::TypeGroup); -// -// auto& general = settings["general"]; -// if (!general.exists("lang")) -// general.add("lang", libconfig::Setting::TypeString) = -// languages.key(lang).toStdString(); -// else { -// general["lang"] = languages.key(lang).toStdString(); -// } -// -// if (!settings.exists("wizard") || -// settings.lookup("wizard").getType() != libconfig::Setting::TypeGroup) -// settings.add("wizard", libconfig::Setting::TypeGroup); -// -// auto& wizard = settings["wizard"]; -// if (!wizard.exists("next_page")) -// wizard.add("next_page", libconfig::Setting::TypeInt) = -// this->wizard()->currentId(); -// else { -// wizard["next_page"] = this->wizard()->currentId(); -// } -// -// GlobalSettingStation::GetInstance().Sync(); -// -// qApp->exit(RESTART_CODE); -// } - int IntroPage::nextId() const { return Wizard::Page_Choose; } ChoosePage::ChoosePage(QWidget* parent) : QWizardPage(parent) { @@ -288,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); @@ -304,10 +248,10 @@ ConclusionPage::ConclusionPage(QWidget* parent) : QWizardPage(parent) { bottomLabel->setWordWrap(true); openHelpCheckBox = new QCheckBox(_("Open offline help.")); - openHelpCheckBox->setChecked(Qt::Checked); + openHelpCheckBox->setChecked(true); dontShowWizardCheckBox = new QCheckBox(_("Dont show the wizard again.")); - dontShowWizardCheckBox->setChecked(Qt::Checked); + dontShowWizardCheckBox->setChecked(true); registerField("showWizard", dontShowWizardCheckBox); // registerField("openHelp", openHelpCheckBox); diff --git a/src/ui/Wizard.h b/src/ui/Wizard.h index 8d7395db..7145d310 100644 --- a/src/ui/Wizard.h +++ b/src/ui/Wizard.h @@ -40,14 +40,12 @@ class Wizard : public QWizard { public: enum WizardPages { Page_Intro, Page_Choose, Page_GenKey, Page_Conclusion }; - Wizard(QWidget* parent = nullptr); + explicit Wizard(QWidget* parent = nullptr); private slots: - void slotWizardAccepted(); signals: - void signalOpenHelp(QString page); }; @@ -57,14 +55,7 @@ class IntroPage : public QWizardPage { public: explicit IntroPage(QWidget* parent = nullptr); - QHash<QString, QString> languages; - [[nodiscard]] int nextId() const override; - - private: - private slots: - - // void slotLangChange(const QString& lang); }; class ChoosePage : public QWizardPage { diff --git a/src/ui/details/SignatureDetailsDialog.cpp b/src/ui/details/SignatureDetailsDialog.cpp new file mode 100644 index 00000000..b9ab6b78 --- /dev/null +++ b/src/ui/details/SignatureDetailsDialog.cpp @@ -0,0 +1,25 @@ +/** + * This file is part of GpgFrontend. + * + * GpgFrontend 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. + * + * Foobar 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 Foobar. If not, see <https://www.gnu.org/licenses/>. + * + * The initial version of the source code is inherited from gpg4usb-team. + * Their source code version also complies with GNU General Public License. + * + * The source code version of this software was modified and released + * by Saturneric<[email protected]> starting on May 12, 2021. + * + */ + +#include "SignatureDetailsDialog.h" diff --git a/src/ui/details/SignatureDetailsDialog.h b/src/ui/details/SignatureDetailsDialog.h new file mode 100644 index 00000000..ea69d1f2 --- /dev/null +++ b/src/ui/details/SignatureDetailsDialog.h @@ -0,0 +1,35 @@ +/** + * This file is part of GpgFrontend. + * + * GpgFrontend 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. + * + * Foobar 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 Foobar. If not, see <https://www.gnu.org/licenses/>. + * + * The initial version of the source code is inherited from gpg4usb-team. + * Their source code version also complies with GNU General Public License. + * + * The source code version of this software was modified and released + * by Saturneric<[email protected]> starting on May 12, 2021. + * + */ + +#ifndef GPGFRONTEND_SIGNATUREDETAILSDIALOG_H +#define GPGFRONTEND_SIGNATUREDETAILSDIALOG_H +#include "ui/GpgFrontendUI.h" + +class SignatureDetailsDialog : public QDialog { + Q_OBJECT + public: + +}; + +#endif // GPGFRONTEND_SIGNATUREDETAILSDIALOG_H diff --git a/src/ui/VerifyDetailsDialog.cpp b/src/ui/details/VerifyDetailsDialog.cpp index 1ad9d996..c03feea5 100644 --- a/src/ui/VerifyDetailsDialog.cpp +++ b/src/ui/details/VerifyDetailsDialog.cpp @@ -22,19 +22,16 @@ * */ -#include "ui/VerifyDetailsDialog.h" +#include "VerifyDetailsDialog.h" #include <boost/format.hpp> namespace GpgFrontend::UI { -VerifyDetailsDialog::VerifyDetailsDialog(QWidget* parent, KeyList* keyList, - GpgError error, GpgVerifyResult result) - : QDialog(parent), - mKeyList(keyList), - mResult(std::move(result)), - error(error) { - this->setWindowTitle(_("Signature Details")); +VerifyDetailsDialog::VerifyDetailsDialog(QWidget* parent, GpgError error, + GpgVerifyResult result) + : QDialog(parent), mResult(std::move(result)), error(error) { + this->setWindowTitle(_("Signatures Details")); mainLayout = new QHBoxLayout(); this->setLayout(mainLayout); @@ -86,7 +83,8 @@ void VerifyDetailsDialog::slotRefresh() { } // Add information box for every single key while (sign) { - auto* sign_box = new VerifyKeyDetailBox(this, mKeyList, sign); + GpgSignature signature(sign); + auto* sign_box = new VerifyKeyDetailBox(signature, this); sign = sign->next; mVboxLayout->addWidget(sign_box); } diff --git a/src/ui/VerifyDetailsDialog.h b/src/ui/details/VerifyDetailsDialog.h index 3de4a56f..5de648f6 100644 --- a/src/ui/VerifyDetailsDialog.h +++ b/src/ui/details/VerifyDetailsDialog.h @@ -34,8 +34,8 @@ namespace GpgFrontend::UI { class VerifyDetailsDialog : public QDialog { Q_OBJECT public: - explicit VerifyDetailsDialog(QWidget* parent, KeyList* keyList, - GpgError error, GpgVerifyResult result); + explicit VerifyDetailsDialog(QWidget* parent, GpgError error, + GpgVerifyResult result); private slots: diff --git a/src/ui/help/AboutDialog.cpp b/src/ui/help/AboutDialog.cpp index 72100713..93e7ccb3 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 (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..98ea1d5c 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; @@ -115,7 +114,7 @@ void KeyGenDialog::slotKeyGenAccept() { [&]() { error = GpgKeyOpera::GetInstance().GenerateKey(genKeyInfo); }); thread->start(); - auto* dialog = new WaitingDialog("Generating", this); + auto* dialog = new WaitingDialog(_("Generating"), this); dialog->show(); while (thread->isRunning()) { diff --git a/src/ui/keygen/SubkeyGenerateDialog.cpp b/src/ui/keygen/SubkeyGenerateDialog.cpp index 593b1cae..9bac076e 100644 --- a/src/ui/keygen/SubkeyGenerateDialog.cpp +++ b/src/ui/keygen/SubkeyGenerateDialog.cpp @@ -65,7 +65,7 @@ QGroupBox* SubkeyGenerateDialog::create_key_usage_group_box() { auto* groupBox = new QGroupBox(this); auto* grid = new QGridLayout(this); - groupBox->setTitle("Key Usage"); + groupBox->setTitle(_("Key Usage")); auto* encrypt = new QCheckBox(_("Encryption"), groupBox); encrypt->setTristate(false); @@ -234,18 +234,17 @@ 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; auto thread = QThread::create([&]() { - LOG(INFO) << "SubkeyGenerateDialog::slotKeyGenAccept() Thread Started"; + LOG(INFO) << "Thread Started"; error = GpgKeyOpera::GetInstance().GenerateSubkey(mKey, genKeyInfo); }); thread->start(); - auto* dialog = new WaitingDialog("Generating", this); + auto* dialog = new WaitingDialog(_("Generating"), this); dialog->show(); while (thread->isRunning()) { diff --git a/src/ui/keypair_details/KeyPairDetailTab.cpp b/src/ui/keypair_details/KeyPairDetailTab.cpp index f88e9edc..de16ccf7 100644 --- a/src/ui/keypair_details/KeyPairDetailTab.cpp +++ b/src/ui/keypair_details/KeyPairDetailTab.cpp @@ -26,6 +26,7 @@ #include "gpg/function/GpgKeyGetter.h" #include "gpg/function/GpgKeyImportExportor.h" +#include "gpg/function/GpgKeyOpera.h" #include "ui/SignalStation.h" #include "ui/UserInterfaceUtils.h" #include "ui/WaitingDialog.h" @@ -33,8 +34,6 @@ namespace GpgFrontend::UI { KeyPairDetailTab::KeyPairDetailTab(const std::string& key_id, QWidget* parent) : QWidget(parent), mKey(GpgKeyGetter::GetInstance().GetKey(key_id)) { - keyid = mKey.id(); - ownerBox = new QGroupBox(_("Owner")); keyBox = new QGroupBox(_("Master Key")); fingerprintBox = new QGroupBox(_("Fingerprint")); @@ -56,31 +55,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(); @@ -98,31 +75,35 @@ 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(algorithmVarLabel, 1, 1); - vboxKD->addWidget(createdVarLabel, 6, 1); vboxKD->addWidget(keyidVarLabel, 0, 1); + vboxKD->addWidget(algorithmVarLabel, 1, 1); + vboxKD->addWidget(keySizeVarLabel, 2, 1); vboxKD->addWidget(usageVarLabel, 3, 1); vboxKD->addWidget(actualUsageVarLabel, 4, 1); - vboxKD->addWidget(masterKeyExistVarLabel, 7, 1); + vboxKD->addWidget(createdVarLabel, 5, 1); + vboxKD->addWidget(expireVarLabel, 6, 1); + vboxKD->addWidget(lastUpdateVarLabel, 7, 1); + vboxKD->addWidget(masterKeyExistVarLabel, 8, 1); ownerBox->setLayout(vboxOD); mvbox->addWidget(ownerBox); keyBox->setLayout(vboxKD); mvbox->addWidget(keyBox); - fingerPrintVarLabel = - new QLabel(beautifyFingerprint(QString::fromStdString(mKey.fpr()))); + fingerPrintVarLabel = new QLabel(); + fingerPrintVarLabel->setWordWrap(false); fingerPrintVarLabel->setTextInteractionFlags(Qt::TextSelectableByMouse); fingerPrintVarLabel->setStyleSheet("margin-left: 0; margin-right: 5;"); + fingerPrintVarLabel->setAlignment(Qt::AlignCenter); auto* hboxFP = new QHBoxLayout(); + hboxFP->addStretch(); hboxFP->addWidget(fingerPrintVarLabel); auto* copyFingerprintButton = new QPushButton(_("Copy")); @@ -132,76 +113,87 @@ KeyPairDetailTab::KeyPairDetailTab(const std::string& key_id, QWidget* parent) SLOT(slotCopyFingerprint())); hboxFP->addWidget(copyFingerprintButton); + hboxFP->addStretch(); fingerprintBox->setLayout(hboxFP); - mvbox->addWidget(fingerprintBox); mvbox->addStretch(); + mvbox->addWidget(fingerprintBox); - if (mKey.is_private_key()) { - auto* privKeyBox = new QGroupBox(_("Operations")); - auto* vboxPK = new QVBoxLayout(); + auto* opera_key_box = new QGroupBox(_("Operations")); + auto* vbox_p_k = new QVBoxLayout(); - auto* exportButton = + auto export_h_box_layout = new QHBoxLayout(); + vbox_p_k->addLayout(export_h_box_layout); + + auto* export_public_button = new QPushButton(_("Export Public Key")); + export_h_box_layout->addWidget(export_public_button); + connect(export_public_button, SIGNAL(clicked()), this, + SLOT(slotExportPublicKey())); + + if (mKey.is_private_key()) { + auto* export_private_button = new QPushButton(_("Export Private Key (Include Subkey)")); - vboxPK->addWidget(exportButton); - connect(exportButton, SIGNAL(clicked()), this, + connect(export_private_button, SIGNAL(clicked()), this, SLOT(slotExportPrivateKey())); + export_h_box_layout->addWidget(export_private_button); if (mKey.has_master_key()) { - auto* editExpiresButton = + auto* edit_expires_button = new QPushButton(_("Modify Expiration Datetime (Master Key)")); - vboxPK->addWidget(editExpiresButton); - connect(editExpiresButton, SIGNAL(clicked()), this, + connect(edit_expires_button, SIGNAL(clicked()), this, SLOT(slotModifyEditDatetime())); - - auto hBoxLayout = new QHBoxLayout(); - auto* keyServerOperaButton = - new QPushButton(_("Key Server Operation (Pubkey)")); - keyServerOperaButton->setStyleSheet("text-align:center;"); - - auto* revokeCertGenButton = - new QPushButton(_("Generate Revoke Certificate")); - connect(revokeCertGenButton, SIGNAL(clicked()), this, - SLOT(slotGenRevokeCert())); - - hBoxLayout->addWidget(keyServerOperaButton); - hBoxLayout->addWidget(revokeCertGenButton); - - vboxPK->addLayout(hBoxLayout); - connect(keyServerOperaButton, SIGNAL(clicked()), this, - SLOT(slotModifyEditDatetime())); - - // Set Menu - createKeyServerOperaMenu(); - keyServerOperaButton->setMenu(keyServerOperaMenu); + auto* edit_password_button = new QPushButton(_("Modify Password")); + connect(edit_password_button, SIGNAL(clicked()), this, + SLOT(slotModifyPassword())); + + auto edit_h_box_layout = new QHBoxLayout(); + edit_h_box_layout->addWidget(edit_expires_button); + edit_h_box_layout->addWidget(edit_password_button); + vbox_p_k->addLayout(edit_h_box_layout); } + } - privKeyBox->setLayout(vboxPK); - mvbox->addWidget(privKeyBox); + auto advance_h_box_layout = new QHBoxLayout(); + auto* key_server_opera_button = + new QPushButton(_("Key Server Operation (Pubkey)")); + key_server_opera_button->setStyleSheet("text-align:center;"); + connect(key_server_opera_button, SIGNAL(clicked()), this, + SLOT(slotModifyEditDatetime())); + // Set Menu + createKeyServerOperaMenu(); + key_server_opera_button->setMenu(keyServerOperaMenu); + advance_h_box_layout->addWidget(key_server_opera_button); + + if (mKey.is_private_key() && mKey.has_master_key()) { + auto* revoke_cert_gen_button = + new QPushButton(_("Generate Revoke Certificate")); + connect(revoke_cert_gen_button, SIGNAL(clicked()), this, + SLOT(slotGenRevokeCert())); + advance_h_box_layout->addWidget(revoke_cert_gen_button); } - if ((mKey.expired()) || (mKey.revoked())) { - auto* expBox = new QHBoxLayout(); - QPixmap pixmap(":warning.png"); + auto* modify_tofu_button = new QPushButton(_("Modify TOFU Policy")); + connect(modify_tofu_button, SIGNAL(clicked()), this, + SLOT(slotModifyTOFUPolicy())); - auto* expLabel = new QLabel(); - auto* iconLabel = new QLabel(); - if (mKey.expired()) { - expLabel->setText(_("Warning: The Master Key has expired.")); - } - if (mKey.revoked()) { - expLabel->setText(_("Warning: The Master Key has been revoked")); - } + vbox_p_k->addLayout(advance_h_box_layout); + opera_key_box->setLayout(vbox_p_k); + mvbox->addWidget(opera_key_box); + vbox_p_k->addWidget(modify_tofu_button); - iconLabel->setPixmap(pixmap.scaled(24, 24, Qt::KeepAspectRatio)); - QFont font = expLabel->font(); - font.setBold(true); - expLabel->setFont(font); - expLabel->setAlignment(Qt::AlignCenter); - expBox->addWidget(iconLabel); - expBox->addWidget(expLabel); - mvbox->addLayout(expBox); - } + auto* expBox = new QHBoxLayout(); + QPixmap pixmap(":warning.png"); + + expLabel = new QLabel(); + iconLabel = new QLabel(); + + iconLabel->setPixmap(pixmap.scaled(24, 24, Qt::KeepAspectRatio)); + expLabel->setAlignment(Qt::AlignCenter); + expBox->addStretch(); + expBox->addWidget(iconLabel); + expBox->addWidget(expLabel); + expBox->addStretch(); + mvbox->addLayout(expBox); // when key database updated connect(SignalStation::GetInstance(), SIGNAL(KeyDatabaseRefresh()), this, @@ -214,6 +206,30 @@ KeyPairDetailTab::KeyPairDetailTab(const std::string& key_id, QWidget* parent) setLayout(mvbox); } +void KeyPairDetailTab::slotExportPublicKey() { + ByteArrayPtr keyArray = nullptr; + + if (!GpgKeyImportExportor::GetInstance().ExportKey(mKey, keyArray)) { + QMessageBox::critical(this, _("Error"), + _("An error occurred during the export operation.")); + return; + } + auto fileString = + mKey.name() + " " + mKey.email() + "(" + mKey.id() + ")_pub.asc"; + auto fileName = + QFileDialog::getSaveFileName( + this, _("Export Key To File"), QString::fromStdString(fileString), + QString(_("Key Files")) + " (*.asc *.txt);;All Files (*)") + .toStdString(); + + if (!write_buffer_to_file(fileName, *keyArray)) { + QMessageBox::critical( + this, _("Export Error"), + QString(_("Couldn't open %1 for writing")).arg(fileName.c_str())); + return; + } +} + void KeyPairDetailTab::slotExportPrivateKey() { // Show a information box with explanation about private key int ret = QMessageBox::information( @@ -234,14 +250,8 @@ void KeyPairDetailTab::slotExportPrivateKey() { _("An error occurred during the export operation.")); return; } - - auto key = GpgKeyGetter::GetInstance().GetKey(keyid); - if (!key.good()) { - QMessageBox::critical(nullptr, _("Error"), _("Key Not Found.")); - return; - } auto fileString = - key.name() + " " + key.email() + "(" + key.id() + ")_secret.asc"; + mKey.name() + " " + mKey.email() + "(" + mKey.id() + ")_secret.asc"; auto fileName = QFileDialog::getSaveFileName( this, _("Export Key To File"), QString::fromStdString(fileString), @@ -250,21 +260,13 @@ void KeyPairDetailTab::slotExportPrivateKey() { if (!write_buffer_to_file(fileName, *keyArray)) { QMessageBox::critical( - nullptr, _("Export Error"), + this, _("Export Error"), QString(_("Couldn't open %1 for writing")).arg(fileName.c_str())); return; } } } -QString KeyPairDetailTab::beautifyFingerprint(QString fingerprint) { - uint len = fingerprint.length(); - if ((len > 0) && (len % 4 == 0)) - for (uint n = 0; 4 * (n + 1) < len; ++n) - fingerprint.insert(static_cast<int>(5u * n + 4u), ' '); - return fingerprint; -} - void KeyPairDetailTab::slotCopyFingerprint() { QString fpr = fingerPrintVarLabel->text().trimmed().replace(" ", QString()); QClipboard* cb = QApplication::clipboard(); @@ -277,54 +279,95 @@ 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())))); - auto key_fpr = mKey.fpr(); - fingerPrintVarLabel->setText( - QString::fromStdString(beautify_fingerprint(key_fpr))); + 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()); + + iconLabel->hide(); + expLabel->hide(); + + if (mKey.expired()) { + iconLabel->show(); + expLabel->show(); + expLabel->setText(_("Warning: The Master Key has expired.")); + } + if (mKey.revoked()) { + iconLabel->show(); + expLabel->show(); + expLabel->setText(_("Warning: The Master Key has been revoked.")); + } } void KeyPairDetailTab::createKeyServerOperaMenu() { @@ -333,9 +376,11 @@ void KeyPairDetailTab::createKeyServerOperaMenu() { auto* uploadKeyPair = new QAction(_("Upload Key Pair to Key Server"), this); connect(uploadKeyPair, SIGNAL(triggered()), this, SLOT(slotUploadKeyToServer())); + if (!mKey.is_private_key()) uploadKeyPair->setDisabled(true); + auto* updateKeyPair = new QAction(_("Update Key Pair"), this); connect(updateKeyPair, SIGNAL(triggered()), this, - SLOT(slotUpdateKeyToServer())); + SLOT(slotUpdateKeyFromServer())); keyServerOperaMenu->addAction(uploadKeyPair); keyServerOperaMenu->addAction(updateKeyPair); @@ -349,7 +394,7 @@ void KeyPairDetailTab::slotUploadKeyToServer() { dialog->slotUpload(); } -void KeyPairDetailTab::slotUpdateKeyToServer() { +void KeyPairDetailTab::slotUpdateKeyFromServer() { auto keys = std::make_unique<KeyIdArgsList>(); keys->push_back(mKey.id()); auto* dialog = new KeyServerImportDialog(this); @@ -403,4 +448,43 @@ void KeyPairDetailTab::slotRefreshKey() { this->slotRefreshKeyInfo(); } +void KeyPairDetailTab::slotModifyPassword() { + auto err = GpgKeyOpera::GetInstance().ModifyPassword(mKey); + if (check_gpg_error_2_err_code(err) != GPG_ERR_NO_ERROR) { + QMessageBox::critical(this, _("Not Successful"), + QString(_("Modify password not successfully."))); + } +} + +void KeyPairDetailTab::slotModifyTOFUPolicy() { + QStringList items; + items << _("Policy Auto") << _("Policy Good") << _("Policy Bad") + << _("Policy Ask") << _("Policy Unknown"); + + bool ok; + QString item = QInputDialog::getItem( + this, _("Modify TOFU Policy(Default is Auto)"), + _("Policy for the Key Pair:"), items, 0, false, &ok); + if (ok && !item.isEmpty()) { + LOG(INFO) << "selected policy" << item.toStdString(); + gpgme_tofu_policy_t tofu_policy = GPGME_TOFU_POLICY_AUTO; + if (item == _("Policy Auto")) { + tofu_policy = GPGME_TOFU_POLICY_AUTO; + } else if (item == _("Policy Good")) { + tofu_policy = GPGME_TOFU_POLICY_GOOD; + } else if (item == _("Policy Bad")) { + tofu_policy = GPGME_TOFU_POLICY_BAD; + } else if (item == _("Policy Ask")) { + tofu_policy = GPGME_TOFU_POLICY_ASK; + } else if (item == _("Policy Unknown")) { + tofu_policy = GPGME_TOFU_POLICY_UNKNOWN; + } + auto err = GpgKeyOpera::GetInstance().ModifyTOFUPolicy(mKey, tofu_policy); + if (check_gpg_error_2_err_code(err) != GPG_ERR_NO_ERROR) { + QMessageBox::critical(this, _("Not Successful"), + QString(_("Modify TOFU policy not successfully."))); + } + } +} + } // namespace GpgFrontend::UI diff --git a/src/ui/keypair_details/KeyPairDetailTab.h b/src/ui/keypair_details/KeyPairDetailTab.h index 782696ac..68ca1ebd 100644 --- a/src/ui/keypair_details/KeyPairDetailTab.h +++ b/src/ui/keypair_details/KeyPairDetailTab.h @@ -36,22 +36,17 @@ namespace GpgFrontend::UI { class KeyPairDetailTab : public QWidget { Q_OBJECT - /** - * @details Return QString with a space inserted at every fourth character - * - * @param fingerprint The fingerprint to be beautified - */ - static QString beautifyFingerprint(QString fingerprint); - void createKeyServerOperaMenu(); private slots: /** - * @details Export the key to a file, which is choosen in a file dialog + * @details Export the key to a file, which is chosen in a file dialog */ void slotExportPrivateKey(); + void slotExportPublicKey(); + /** * @details Copy the fingerprint to clipboard */ @@ -59,19 +54,21 @@ class KeyPairDetailTab : public QWidget { void slotModifyEditDatetime(); + void slotModifyPassword(); + void slotRefreshKeyInfo(); void slotUploadKeyToServer(); - void slotUpdateKeyToServer(); + void slotUpdateKeyFromServer(); void slotGenRevokeCert(); void slotRefreshKey(); - private: - std::string keyid; /** The id of the key the details should be shown for */ + void slotModifyTOFUPolicy(); + private: GpgKey mKey; QGroupBox* ownerBox; /** Groupbox containing owner information */ @@ -80,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 */ @@ -93,6 +91,9 @@ class KeyPairDetailTab : public QWidget { QLabel* actualUsageVarLabel; QLabel* masterKeyExistVarLabel; + QLabel* iconLabel; + QLabel* expLabel; + QMenu* keyServerOperaMenu{}; public: 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 3d56699a..b2aa8861 100644 --- a/src/ui/keypair_details/KeyPairUIDTab.cpp +++ b/src/ui/keypair_details/KeyPairUIDTab.cpp @@ -28,6 +28,7 @@ #include "gpg/function/GpgKeyManager.h" #include "gpg/function/UidOperator.h" #include "ui/SignalStation.h" +#include "ui/widgets/TOFUInfoPage.h" namespace GpgFrontend::UI { @@ -53,31 +54,47 @@ KeyPairUIDTab::KeyPairUIDTab(const std::string& key_id, QWidget* parent) uidButtonsLayout->addWidget(addUIDButton, 0, 1); uidButtonsLayout->addWidget(manageUIDButton, 0, 2); - auto gridLayout = new QGridLayout(); + auto grid_layout = new QGridLayout(); - gridLayout->addWidget(uidList, 0, 0); - gridLayout->addLayout(uidButtonsLayout, 1, 0); - gridLayout->setContentsMargins(0, 10, 0, 0); + grid_layout->addWidget(uidList, 0, 0); + grid_layout->addLayout(uidButtonsLayout, 1, 0); + grid_layout->setContentsMargins(0, 10, 0, 0); - auto uidGroupBox = new QGroupBox(); - uidGroupBox->setLayout(gridLayout); - uidGroupBox->setTitle(_("UIDs")); + auto uid_group_box = new QGroupBox(); + uid_group_box->setLayout(grid_layout); + uid_group_box->setTitle(_("UIDs")); - auto signGridLayout = new QGridLayout(); - signGridLayout->addWidget(sigList, 0, 0); - signGridLayout->setContentsMargins(0, 10, 0, 0); + auto tofu_group_box = new QGroupBox(); + auto tofu_vbox_layout = new QVBoxLayout(); + tofu_group_box->setLayout(tofu_vbox_layout); + tofu_group_box->setTitle(_("TOFU")); +#if !defined(RELEASE) + tofuTabs = new QTabWidget(this); + tofu_vbox_layout->addWidget(tofuTabs); +#endif - auto signGroupBox = new QGroupBox(); - signGroupBox->setLayout(signGridLayout); - signGroupBox->setTitle(_("Signature of Selected UID")); + auto sign_grid_layout = new QGridLayout(); + sign_grid_layout->addWidget(sigList, 0, 0); + sign_grid_layout->setContentsMargins(0, 10, 0, 0); + + auto sign_group_box = new QGroupBox(); + sign_group_box->setLayout(sign_grid_layout); + sign_group_box->setTitle(_("Signature of Selected UID")); auto vboxLayout = new QVBoxLayout(); - vboxLayout->addWidget(uidGroupBox); - vboxLayout->addWidget(signGroupBox); + vboxLayout->addWidget(uid_group_box); +#if !defined(RELEASE) + // Function needed testing + vboxLayout->addWidget(tofu_group_box); +#endif + vboxLayout->addWidget(sign_group_box); + vboxLayout->setContentsMargins(0, 0, 0, 0); connect(addUIDButton, SIGNAL(clicked(bool)), this, SLOT(slotAddUID())); connect(uidList, SIGNAL(itemSelectionChanged()), this, + SLOT(slotRefreshTOFUInfo())); + connect(uidList, SIGNAL(itemSelectionChanged()), this, SLOT(slotRefreshSigList())); // Key Database Refresh @@ -189,6 +206,32 @@ void KeyPairUIDTab::slotRefreshUIDList() { } slotRefreshSigList(); + slotRefreshTOFUInfo(); +} + +void KeyPairUIDTab::slotRefreshTOFUInfo() { + if (this->tofuTabs == nullptr) return; + + int uidRow = 0; + tofuTabs->clear(); + for (const auto& uid : buffered_uids) { + // Only Show Selected UID Signatures + if (!uidList->item(uidRow++, 0)->isSelected()) { + continue; + } + auto tofu_infos = uid.tofu_infos(); + LOG(INFO) << "tofu info size" << tofu_infos->size(); + if (tofu_infos->empty()) { + tofuTabs->hide(); + } else { + tofuTabs->show(); + } + int index = 1; + for (const auto& tofu_info : *tofu_infos) { + tofuTabs->addTab(new TOFUInfoPage(tofu_info, this), + QString(_("TOFU %1")).arg(index++)); + } + } } void KeyPairUIDTab::slotRefreshSigList() { @@ -228,16 +271,16 @@ void KeyPairUIDTab::slotRefreshSigList() { sigList->setItem(sigRow, 2, tmp3); } - auto* tmp4 = new QTableWidgetItem(QString::fromStdString( - boost::gregorian::to_iso_string(sig.create_time()))); + auto* tmp4 = new QTableWidgetItem(QLocale::system().toString( + QDateTime::fromTime_t(to_time_t(sig.create_time())))); sigList->setItem(sigRow, 3, tmp4); 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()))); + : QLocale::system().toString( + QDateTime::fromTime_t(to_time_t(sig.expire_time())))); tmp5->setTextAlignment(Qt::AlignCenter); sigList->setItem(sigRow, 4, tmp5); @@ -329,7 +372,7 @@ void KeyPairUIDTab::slotDelUID() { "</b><br/><br/>" + keynames + +"<br/>" + _("The action can not be undone."), QMessageBox::No | QMessageBox::Yes); - + if (ret == QMessageBox::Yes) { for (const auto& uid : *selected_uids) { LOG(INFO) << "KeyPairUIDTab::slotDelUID UID" << uid; @@ -423,9 +466,9 @@ void KeyPairUIDTab::contextMenuEvent(QContextMenuEvent* event) { uidPopupMenu->exec(event->globalPos()); } - if (!sigList->selectedItems().isEmpty()) { - signPopupMenu->exec(event->globalPos()); - } + // if (!sigList->selectedItems().isEmpty()) { + // signPopupMenu->exec(event->globalPos()); + // } } void KeyPairUIDTab::slotAddSignSingle() { @@ -528,6 +571,7 @@ void KeyPairUIDTab::slotDelSign() { void KeyPairUIDTab::slotRefreshKey() { this->mKey = GpgKeyGetter::GetInstance().GetKey(this->mKey.id()); this->slotRefreshUIDList(); + this->slotRefreshTOFUInfo(); this->slotRefreshSigList(); } diff --git a/src/ui/keypair_details/KeyPairUIDTab.h b/src/ui/keypair_details/KeyPairUIDTab.h index 6dece8d5..823935d4 100644 --- a/src/ui/keypair_details/KeyPairUIDTab.h +++ b/src/ui/keypair_details/KeyPairUIDTab.h @@ -45,6 +45,7 @@ class KeyPairUIDTab : public QWidget { GpgKey mKey; QTableWidget* uidList{}; QTableWidget* sigList{}; + QTabWidget* tofuTabs{}; QMenu* manageSelectedUIDMenu{}; QMenu* uidPopupMenu{}; QMenu* signPopupMenu{}; @@ -71,6 +72,8 @@ class KeyPairUIDTab : public QWidget { void slotRefreshUIDList(); + void slotRefreshTOFUInfo(); + void slotRefreshSigList(); void slotAddSign(); 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 6cce116b..d9592c56 100644 --- a/src/ui/keypair_details/KeyUIDSignDialog.cpp +++ b/src/ui/keypair_details/KeyUIDSignDialog.cpp @@ -33,18 +33,18 @@ namespace GpgFrontend::UI { KeyUIDSignDialog::KeyUIDSignDialog(const GpgKey& key, UIDArgsListPtr uid, QWidget* parent) : QDialog(parent), mUids(std::move(uid)), mKey(key) { - mKeyList = - new KeyList(KeyListRow::ONLY_SECRET_KEY, - KeyListColumn::NAME | KeyListColumn::EmailAddress, this); - - mKeyList->setFilter([](const GpgKey& key) -> bool { - if (key.disabled() || !key.can_certify() || !key.has_master_key() || - key.expired() || key.revoked()) - return false; - else - return true; - }); - mKeyList->setExcludeKeys({key.id()}); + const auto key_id = mKey.id(); + mKeyList = new KeyList( + KeyListRow::ONLY_SECRET_KEY, + KeyListColumn::NAME | KeyListColumn::EmailAddress, + [key_id](const GpgKey& key) -> bool { + if (key.disabled() || !key.can_certify() || !key.has_master_key() || + key.expired() || key.revoked() || key_id == key.id()) + return false; + else + return true; + }, + this); mKeyList->slotRefresh(); signKeyButton = new QPushButton("Sign"); @@ -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/MainWindowFileSlotFunction.cpp b/src/ui/main_window/MainWindowFileSlotFunction.cpp index 25445dcc..19be9769 100644 --- a/src/ui/main_window/MainWindowFileSlotFunction.cpp +++ b/src/ui/main_window/MainWindowFileSlotFunction.cpp @@ -164,15 +164,6 @@ void MainWindow::slotFileSign() { if (!file_pre_check(this, path)) return; - if (QFile::exists(path + ".sig")) { - auto ret = QMessageBox::warning( - this, _("Warning"), - _("The target file already exists, do you need to overwrite it?"), - QMessageBox::Ok | QMessageBox::Cancel); - - if (ret == QMessageBox::Cancel) return; - } - auto key_ids = mKeyList->getChecked(); auto keys = GpgKeyGetter::GetInstance().GetKeys(key_ids); @@ -193,6 +184,18 @@ void MainWindow::slotFileSign() { } } + auto sig_file_path = boost::filesystem::path(path.toStdString() + ".sig"); + if (QFile::exists(sig_file_path.string().c_str())) { + auto ret = QMessageBox::warning( + this, _("Warning"), + QString(_("The signature file \"%1\" exists, " + "do you need to overwrite it?")) + .arg(sig_file_path.filename().string().c_str()), + QMessageBox::Ok | QMessageBox::Cancel); + + if (ret == QMessageBox::Cancel) return; + } + GpgSignResult result = nullptr; gpgme_error_t error; bool if_error = false; @@ -242,12 +245,22 @@ void MainWindow::slotFileVerify() { signFilePath = path + ".sig"; } + bool ok; + QString text = + QInputDialog::getText(this, _("Origin file to verify"), _("Filepath"), + QLineEdit::Normal, dataFilePath, &ok); + if (ok && !text.isEmpty()) { + dataFilePath = text; + } else { + return; + } + QFileInfo dataFileInfo(dataFilePath), signFileInfo(signFilePath); if (!dataFileInfo.isFile() || !signFileInfo.isFile()) { QMessageBox::critical( this, _("Error"), - _("Please select the appropriate target file or signature file. " + _("Please select the appropriate origin file or signature file. " "Ensure that both are in this directory.")); return; } @@ -274,43 +287,15 @@ void MainWindow::slotFileVerify() { }); if (!if_error) { - auto resultAnalyse = VerifyResultAnalyse(error, std::move(result)); - resultAnalyse.analyse(); - process_result_analyse(edit, infoBoard, resultAnalyse); + auto result_analyse = VerifyResultAnalyse(error, std::move(result)); + result_analyse.analyse(); + process_result_analyse(edit, infoBoard, result_analyse); - if (resultAnalyse.getStatus() == -2) { - QMessageBox::StandardButton reply; - reply = QMessageBox::question( - this, _("Public key not found locally"), - _("There is no target public key content in local for GpgFrontend to " - "gather enough information about this Signature. Do you want to " - "import the public key from Keyserver now?"), - QMessageBox::Yes | QMessageBox::No); - if (reply == QMessageBox::Yes) { - qDebug() << "Yes was clicked"; - auto dialog = KeyServerImportDialog(true, this); - auto key_ids = std::make_unique<KeyIdArgsList>(); - auto* signature = resultAnalyse.GetSignatures(); - while (signature != nullptr) { - LOG(INFO) << "signature fpr" << signature->fpr; - key_ids->push_back(signature->fpr); - signature = signature->next; - } - dialog.slotImport(key_ids); - dialog.show(); - - } else { - qDebug() << "Yes was *not* clicked"; - } - } + if (result_analyse.getStatus() == -2) + import_unknown_key_from_keyserver(this, result_analyse); - // if (resultAnalyse.getStatus() >= 0) { - // infoBoard->resetOptionActionsMenu(); - // infoBoard->addOptionalAction( - // "Show Verify Details", [this, error, &result]() { - // VerifyDetailsDialog(this, mKeyList, error, result); - // }); - // } + if (result_analyse.getStatus() >= 0) + show_verify_details(this, infoBoard, error, result_analyse); fileTreeView->update(); } else { @@ -433,21 +418,17 @@ void MainWindow::slotFileDecryptVerify() { }); if (!if_error) { - infoBoard->associateFileTreeView(edit->curFilePage()); - auto decrypt_res = DecryptResultAnalyse(error, std::move(d_result)); auto verify_res = VerifyResultAnalyse(error, std::move(v_result)); decrypt_res.analyse(); verify_res.analyse(); process_result_analyse(edit, infoBoard, decrypt_res, verify_res); - // if (verify_res.getStatus() >= 0) { - // infoBoard->resetOptionActionsMenu(); - // infoBoard->addOptionalAction( - // "Show Verify Details", [this, error, v_result]() { - // VerifyDetailsDialog(this, mCtx, mKeyList, error, v_result); - // }); - // } + if (verify_res.getStatus() == -2) + import_unknown_key_from_keyserver(this, verify_res); + + if (verify_res.getStatus() >= 0) + show_verify_details(this, infoBoard, error, verify_res); fileTreeView->update(); } else { diff --git a/src/ui/main_window/MainWindowSlotFunction.cpp b/src/ui/main_window/MainWindowSlotFunction.cpp index f1432196..4ad33ac3 100644 --- a/src/ui/main_window/MainWindowSlotFunction.cpp +++ b/src/ui/main_window/MainWindowSlotFunction.cpp @@ -39,6 +39,7 @@ #include "gpg/function/GpgKeyGetter.h" #include "gpg/function/GpgKeyImportExportor.h" #include "ui/UserInterfaceUtils.h" +#include "ui/help/AboutDialog.h" #include "ui/widgets/SignersPicker.h" namespace GpgFrontend::UI { @@ -46,181 +47,166 @@ namespace GpgFrontend::UI { * Encrypt Entry(Text & File) */ void MainWindow::slotEncrypt() { - if (edit->tabCount() == 0) return; + if (edit->tabCount() == 0 || edit->slotCurPageTextEdit() == nullptr) return; - if (edit->slotCurPageTextEdit() != nullptr) { - auto key_ids = mKeyList->getChecked(); + auto key_ids = mKeyList->getChecked(); - if (key_ids->empty()) { - QMessageBox::critical(nullptr, _("No Key Selected"), - _("No Key Selected")); - return; - } + if (key_ids->empty()) { + QMessageBox::critical(nullptr, _("No Key Selected"), _("No Key Selected")); + return; + } - auto key_getter = GpgFrontend::GpgKeyGetter::GetInstance(); - auto keys = GpgKeyGetter::GetInstance().GetKeys(key_ids); - for (const auto& key : *keys) { - if (!key.CanEncrActual()) { - QMessageBox::information( - nullptr, _("Invalid Operation"), - QString(_( - "The selected key contains a key that does not actually have a " + auto key_getter = GpgFrontend::GpgKeyGetter::GetInstance(); + auto keys = GpgKeyGetter::GetInstance().GetKeys(key_ids); + for (const auto& key : *keys) { + if (!key.CanEncrActual()) { + QMessageBox::information( + nullptr, _("Invalid Operation"), + QString( + _("The selected key contains a key that does not actually have a " "encrypt usage.")) + - "<br/><br/>" + _("For example the Following Key:") + " <br/>" + - QString::fromStdString(key.uids()->front().uid())); - return; - } + "<br/><br/>" + _("For example the Following Key:") + " <br/>" + + QString::fromStdString(key.uids()->front().uid())); + return; } + } - auto tmp = std::make_unique<ByteArray>(); - - GpgEncrResult result = nullptr; - GpgError error; - bool if_error = false; - process_operation(this, _("Encrypting"), [&]() { - try { - auto buffer = edit->curTextPage()->toPlainText().toUtf8().toStdString(); - error = GpgFrontend::BasicOperator::GetInstance().Encrypt( - std::move(keys), buffer, tmp, result); - } catch (const std::runtime_error& e) { - if_error = true; - } - }); + auto tmp = std::make_unique<ByteArray>(); + + GpgEncrResult result = nullptr; + GpgError error; + bool if_error = false; + process_operation(this, _("Encrypting"), [&]() { + try { + auto buffer = edit->curTextPage()->toPlainText().toUtf8().toStdString(); + error = GpgFrontend::BasicOperator::GetInstance().Encrypt( + std::move(keys), buffer, tmp, result); + } catch (const std::runtime_error& e) { + if_error = true; + } + }); - if (!if_error) { - auto resultAnalyse = EncryptResultAnalyse(error, std::move(result)); - resultAnalyse.analyse(); - process_result_analyse(edit, infoBoard, resultAnalyse); + if (!if_error) { + auto resultAnalyse = EncryptResultAnalyse(error, std::move(result)); + resultAnalyse.analyse(); + process_result_analyse(edit, infoBoard, resultAnalyse); - if (check_gpg_error_2_err_code(error) == GPG_ERR_NO_ERROR) - edit->slotFillTextEditWithText(QString::fromStdString(*tmp)); + if (check_gpg_error_2_err_code(error) == GPG_ERR_NO_ERROR) + edit->slotFillTextEditWithText(QString::fromStdString(*tmp)); #ifdef SMTP_SUPPORT - // set optional actions - if (resultAnalyse.getStatus() >= 0) { - infoBoard->resetOptionActionsMenu(); - infoBoard->addOptionalAction("Send Mail", [this]() { - if (settings.value("sendMail/enable", false).toBool()) - new SendMailDialog(edit->curTextPage()->toPlainText(), this); - else { - QMessageBox::warning(nullptr, _("Function Disabled"), - _("Please go to the settings interface to " - "enable and configure this function.")); - } - }); - } -#endif - - } else { - QMessageBox::critical(this, _("Error"), - _("An error occurred during operation.")); - return; + // set optional actions + if (resultAnalyse.getStatus() >= 0) { + infoBoard->resetOptionActionsMenu(); + infoBoard->addOptionalAction("Send Mail", [this]() { + if (settings.value("sendMail/enable", false).toBool()) + new SendMailDialog(edit->curTextPage()->toPlainText(), this); + else { + QMessageBox::warning(nullptr, _("Function Disabled"), + _("Please go to the settings interface to " + "enable and configure this function.")); + } + }); } +#endif - } else if (edit->slotCurPageFileTreeView() != nullptr) { - this->slotFileEncrypt(); + } else { + QMessageBox::critical(this, _("Error"), + _("An error occurred during operation.")); + return; } } void MainWindow::slotSign() { - if (edit->tabCount() == 0) return; + if (edit->tabCount() == 0 || edit->slotCurPageTextEdit() == nullptr) return; - if (edit->slotCurPageTextEdit() != nullptr) { - auto key_ids = mKeyList->getPrivateChecked(); + auto key_ids = mKeyList->getPrivateChecked(); - if (key_ids->empty()) { - QMessageBox::critical(this, _("No Key Selected"), _("No Key Selected")); - return; - } + if (key_ids->empty()) { + QMessageBox::critical(this, _("No Key Selected"), _("No Key Selected")); + return; + } - auto keys = GpgKeyGetter::GetInstance().GetKeys(key_ids); - for (const auto& key : *keys) { - if (!key.CanSignActual()) { - QMessageBox::information( - this, _("Invalid Operation"), - QString(_( - "The selected key contains a key that does not actually have a " + auto keys = GpgKeyGetter::GetInstance().GetKeys(key_ids); + for (const auto& key : *keys) { + if (!key.CanSignActual()) { + QMessageBox::information( + this, _("Invalid Operation"), + QString( + _("The selected key contains a key that does not actually have a " "signature usage.")) + - "<br/><br/>" + _("For example the Following Key:") + "<br/>" + - key.uids()->front().uid().c_str()); - return; - } + "<br/><br/>" + _("For example the Following Key:") + "<br/>" + + key.uids()->front().uid().c_str()); + return; } + } - auto tmp = std::make_unique<ByteArray>(); + auto tmp = std::make_unique<ByteArray>(); - GpgSignResult result = nullptr; - gpgme_error_t error; - bool if_error = false; + GpgSignResult result = nullptr; + gpgme_error_t error; + bool if_error = false; - process_operation(this, _("Signing"), [&]() { - try { - auto buffer = edit->curTextPage()->toPlainText().toUtf8().toStdString(); - error = GpgFrontend::BasicOperator::GetInstance().Sign( - std::move(keys), buffer, tmp, GPGME_SIG_MODE_CLEAR, result); - } catch (const std::runtime_error& e) { - if_error = true; - } - }); + process_operation(this, _("Signing"), [&]() { + try { + auto buffer = edit->curTextPage()->toPlainText().toUtf8().toStdString(); + error = GpgFrontend::BasicOperator::GetInstance().Sign( + std::move(keys), buffer, tmp, GPGME_SIG_MODE_CLEAR, result); + } catch (const std::runtime_error& e) { + if_error = true; + } + }); - if (!if_error) { - auto resultAnalyse = SignResultAnalyse(error, std::move(result)); - resultAnalyse.analyse(); - process_result_analyse(edit, infoBoard, resultAnalyse); + if (!if_error) { + auto resultAnalyse = SignResultAnalyse(error, std::move(result)); + resultAnalyse.analyse(); + process_result_analyse(edit, infoBoard, resultAnalyse); - if (check_gpg_error_2_err_code(error) == GPG_ERR_NO_ERROR) - edit->slotFillTextEditWithText(QString::fromStdString(*tmp)); - } else { - QMessageBox::critical(this, _("Error"), - _("An error occurred during operation.")); - return; - } - } else if (edit->slotCurPageFileTreeView() != nullptr) { - this->slotFileSign(); + if (check_gpg_error_2_err_code(error) == GPG_ERR_NO_ERROR) + edit->slotFillTextEditWithText(QString::fromStdString(*tmp)); + } else { + QMessageBox::critical(this, _("Error"), + _("An error occurred during operation.")); + return; } } void MainWindow::slotDecrypt() { - if (edit->tabCount() == 0) return; + if (edit->tabCount() == 0 || edit->slotCurPageTextEdit() == nullptr) return; - if (edit->slotCurPageTextEdit() != nullptr) { - auto decrypted = std::make_unique<ByteArray>(); - QByteArray text = edit->curTextPage()->toPlainText().toUtf8(); + auto decrypted = std::make_unique<ByteArray>(); + QByteArray text = edit->curTextPage()->toPlainText().toUtf8(); - if (text.trimmed().startsWith( - GpgConstants::GPG_FRONTEND_SHORT_CRYPTO_HEAD)) { - QMessageBox::critical( - this, _("Notice"), - _("Short Crypto Text only supports Decrypt & Verify.")); - return; - } + if (text.trimmed().startsWith(GpgConstants::GPG_FRONTEND_SHORT_CRYPTO_HEAD)) { + QMessageBox::critical( + this, _("Notice"), + _("Short Crypto Text only supports Decrypt & Verify.")); + return; + } - GpgDecrResult result = nullptr; - gpgme_error_t error; - bool if_error = false; - process_operation(this, _("Decrypting"), [&]() { - try { - auto buffer = text.toStdString(); - error = GpgFrontend::BasicOperator::GetInstance().Decrypt( - buffer, decrypted, result); - } catch (const std::runtime_error& e) { - if_error = true; - } - }); + GpgDecrResult result = nullptr; + gpgme_error_t error; + bool if_error = false; + process_operation(this, _("Decrypting"), [&]() { + try { + auto buffer = text.toStdString(); + error = GpgFrontend::BasicOperator::GetInstance().Decrypt( + buffer, decrypted, result); + } catch (const std::runtime_error& e) { + if_error = true; + } + }); - if (!if_error) { - auto resultAnalyse = DecryptResultAnalyse(error, std::move(result)); - resultAnalyse.analyse(); - process_result_analyse(edit, infoBoard, resultAnalyse); + if (!if_error) { + auto resultAnalyse = DecryptResultAnalyse(error, std::move(result)); + resultAnalyse.analyse(); + process_result_analyse(edit, infoBoard, resultAnalyse); - if (check_gpg_error_2_err_code(error) == GPG_ERR_NO_ERROR) - edit->slotFillTextEditWithText(QString::fromStdString(*decrypted)); - } else { - QMessageBox::critical(this, _("Error"), - _("An error occurred during operation.")); - return; - } - } else if (edit->slotCurPageFileTreeView() != nullptr) { - this->slotFileDecrypt(); + if (check_gpg_error_2_err_code(error) == GPG_ERR_NO_ERROR) + edit->slotFillTextEditWithText(QString::fromStdString(*decrypted)); + } else { + QMessageBox::critical(this, _("Error"), + _("An error occurred during operation.")); + return; } } @@ -237,244 +223,218 @@ void MainWindow::slotFind() { } void MainWindow::slotVerify() { - if (edit->tabCount() == 0) return; - - if (edit->slotCurPageTextEdit() != nullptr) { - auto text = edit->curTextPage()->toPlainText().toUtf8(); - // TODO(Saturneric) PreventNoDataErr - - auto sig_buffer = std::make_unique<ByteArray>(); - sig_buffer.reset(); - - GpgVerifyResult result = nullptr; - GpgError error; - bool if_error = false; - process_operation(this, _("Verifying"), [&]() { - try { - auto buffer = text.toStdString(); - error = GpgFrontend::BasicOperator::GetInstance().Verify( - buffer, sig_buffer, result); - } catch (const std::runtime_error& e) { - if_error = true; - } - }); - - if (!if_error) { - auto resultAnalyse = VerifyResultAnalyse(error, std::move(result)); - resultAnalyse.analyse(); - process_result_analyse(edit, infoBoard, resultAnalyse); - - // if (resultAnalyse->getStatus() >= 0) { - // infoBoard->resetOptionActionsMenu(); - // infoBoard->addOptionalAction( - // "Show Verify Details", [this, error, result]() { - // VerifyDetailsDialog(this, mCtx, mKeyList, error, result); - // }); - // } - - } else { - QMessageBox::critical(this, _("Error"), - _("An error occurred during operation.")); - return; + if (edit->tabCount() == 0 || edit->slotCurPageTextEdit() == nullptr) return; + + auto text = edit->curTextPage()->toPlainText().toUtf8(); + // TODO(Saturneric) PreventNoDataErr + + auto sig_buffer = std::make_unique<ByteArray>(); + sig_buffer.reset(); + + GpgVerifyResult result = nullptr; + GpgError error; + bool if_error = false; + process_operation(this, _("Verifying"), [&]() { + try { + auto buffer = text.toStdString(); + error = GpgFrontend::BasicOperator::GetInstance().Verify( + buffer, sig_buffer, result); + } catch (const std::runtime_error& e) { + if_error = true; } - } else if (edit->slotCurPageFileTreeView() != nullptr) { - this->slotFileVerify(); + }); + + if (!if_error) { + auto result_analyse = VerifyResultAnalyse(error, std::move(result)); + result_analyse.analyse(); + process_result_analyse(edit, infoBoard, result_analyse); + + if (result_analyse.getStatus() == -2) + import_unknown_key_from_keyserver(this, result_analyse); + + if (result_analyse.getStatus() >= 0) + show_verify_details(this, infoBoard, error, result_analyse); } } void MainWindow::slotEncryptSign() { - if (edit->tabCount() == 0) return; + if (edit->tabCount() == 0 || edit->slotCurPageTextEdit() == nullptr) return; - if (edit->slotCurPageTextEdit() != nullptr) { - auto key_ids = mKeyList->getChecked(); + auto key_ids = mKeyList->getChecked(); - if (key_ids->empty()) { - QMessageBox::critical(nullptr, _("No Key Selected"), - _("No Key Selected")); - return; - } + if (key_ids->empty()) { + QMessageBox::critical(nullptr, _("No Key Selected"), _("No Key Selected")); + return; + } - auto keys = GpgKeyGetter::GetInstance().GetKeys(key_ids); + auto keys = GpgKeyGetter::GetInstance().GetKeys(key_ids); - for (const auto& key : *keys) { - bool key_can_encrypt = key.CanEncrActual(); + for (const auto& key : *keys) { + bool key_can_encrypt = key.CanEncrActual(); - if (!key_can_encrypt) { - QMessageBox::critical( - nullptr, _("Invalid KeyPair"), - QString(_("The selected keypair cannot be used for encryption.")) + - "<br/><br/>" + _("For example the Following Key:") + " <br/>" + - QString::fromStdString(key.uids()->front().uid())); - return; - } + if (!key_can_encrypt) { + QMessageBox::critical( + nullptr, _("Invalid KeyPair"), + QString(_("The selected keypair cannot be used for encryption.")) + + "<br/><br/>" + _("For example the Following Key:") + " <br/>" + + QString::fromStdString(key.uids()->front().uid())); + return; } + } - auto signersPicker = new SignersPicker(this); - QEventLoop loop; - connect(signersPicker, SIGNAL(finished(int)), &loop, SLOT(quit())); - loop.exec(); + auto signersPicker = new SignersPicker(this); + QEventLoop loop; + connect(signersPicker, SIGNAL(finished(int)), &loop, SLOT(quit())); + loop.exec(); - auto signer_key_ids = signersPicker->getCheckedSigners(); - auto signer_keys = GpgKeyGetter::GetInstance().GetKeys(signer_key_ids); + auto signer_key_ids = signersPicker->getCheckedSigners(); + auto signer_keys = GpgKeyGetter::GetInstance().GetKeys(signer_key_ids); - for (const auto& key : *keys) { - LOG(INFO) << "Keys " << key.email(); - } + for (const auto& key : *keys) { + LOG(INFO) << "Keys " << key.email(); + } - for (const auto& signer : *signer_keys) { - LOG(INFO) << "Signers " << signer.email(); - } + for (const auto& signer : *signer_keys) { + LOG(INFO) << "Signers " << signer.email(); + } - GpgEncrResult encr_result = nullptr; - GpgSignResult sign_result = nullptr; - GpgError error; - bool if_error = false; - - auto tmp = std::make_unique<ByteArray>(); - process_operation(this, _("Encrypting and Signing"), [&]() { - try { - auto buffer = edit->curTextPage()->toPlainText().toUtf8().toStdString(); - error = GpgFrontend::BasicOperator::GetInstance().EncryptSign( - std::move(keys), std::move(signer_keys), buffer, tmp, encr_result, - sign_result); - } catch (const std::runtime_error& e) { - if_error = true; - } - }); + GpgEncrResult encr_result = nullptr; + GpgSignResult sign_result = nullptr; + GpgError error; + bool if_error = false; + + auto tmp = std::make_unique<ByteArray>(); + process_operation(this, _("Encrypting and Signing"), [&]() { + try { + auto buffer = edit->curTextPage()->toPlainText().toUtf8().toStdString(); + error = GpgFrontend::BasicOperator::GetInstance().EncryptSign( + std::move(keys), std::move(signer_keys), buffer, tmp, encr_result, + sign_result); + } catch (const std::runtime_error& e) { + if_error = true; + } + }); - if (!if_error) { + if (!if_error) { #ifdef ADVANCE_SUPPORT - if (settings.value("advanced/autoPubkeyExchange").toBool()) { - PubkeyUploader pubkeyUploader(mCtx, signerKeys); - pubkeyUploader.start(); - if (!pubkeyUploader.result()) { - QMessageBox::warning( - nullptr, _("Automatic Key Exchange Warning"), - _("Part of the automatic key exchange failed, " - "which may be related to your key.") + - _("If possible, try to use the RSA algorithm " - "compatible with the server for signing.")); - } + if (settings.value("advanced/autoPubkeyExchange").toBool()) { + PubkeyUploader pubkeyUploader(mCtx, signerKeys); + pubkeyUploader.start(); + if (!pubkeyUploader.result()) { + QMessageBox::warning(nullptr, _("Automatic Key Exchange Warning"), + _("Part of the automatic key exchange failed, " + "which may be related to your key.") + + _("If possible, try to use the RSA algorithm " + "compatible with the server for signing.")); } + } #endif - LOG(INFO) << "ResultAnalyse Started"; - auto encrypt_res = EncryptResultAnalyse(error, std::move(encr_result)); - auto sign_res = SignResultAnalyse(error, std::move(sign_result)); - encrypt_res.analyse(); - sign_res.analyse(); - process_result_analyse(edit, infoBoard, encrypt_res, sign_res); - if (check_gpg_error_2_err_code(error) == GPG_ERR_NO_ERROR) - edit->slotFillTextEditWithText(QString::fromStdString(*tmp)); + LOG(INFO) << "ResultAnalyse Started"; + auto encrypt_res = EncryptResultAnalyse(error, std::move(encr_result)); + auto sign_res = SignResultAnalyse(error, std::move(sign_result)); + encrypt_res.analyse(); + sign_res.analyse(); + process_result_analyse(edit, infoBoard, encrypt_res, sign_res); + if (check_gpg_error_2_err_code(error) == GPG_ERR_NO_ERROR) + edit->slotFillTextEditWithText(QString::fromStdString(*tmp)); #ifdef SMTP_SUPPORT - infoBoard->resetOptionActionsMenu(); - infoBoard->addOptionalAction("Send Mail", [this]() { - if (settings.value("sendMail/enable", false).toBool()) - new SendMailDialog(edit->curTextPage()->toPlainText(), this); - else { - QMessageBox::warning(nullptr, _("Function Disabled"), - _("Please go to the settings interface to " - "enable and configure this function.")); - } - }); + infoBoard->resetOptionActionsMenu(); + infoBoard->addOptionalAction("Send Mail", [this]() { + if (settings.value("sendMail/enable", false).toBool()) + new SendMailDialog(edit->curTextPage()->toPlainText(), this); + else { + QMessageBox::warning(nullptr, _("Function Disabled"), + _("Please go to the settings interface to " + "enable and configure this function.")); + } + }); #endif #ifdef ADVANCE_SUPPORT - infoBoard->addOptionalAction("Shorten Ciphertext", [this]() { - if (settings.value("general/serviceToken").toString().isEmpty()) - QMessageBox::warning(nullptr, _("Service Token Empty"), - _("Please go to the settings interface to set " - "Own Key and get Service Token.")); - else { - shortenCryptText(); - } - }); + infoBoard->addOptionalAction("Shorten Ciphertext", [this]() { + if (settings.value("general/serviceToken").toString().isEmpty()) + QMessageBox::warning(nullptr, _("Service Token Empty"), + _("Please go to the settings interface to set " + "Own Key and get Service Token.")); + else { + shortenCryptText(); + } + }); #endif - } else { - QMessageBox::critical(this, _("Error"), - _("An error occurred during operation.")); - return; - } - } else if (edit->slotCurPageFileTreeView() != nullptr) { - this->slotFileEncryptSign(); + } else { + QMessageBox::critical(this, _("Error"), + _("An error occurred during operation.")); + return; } } void MainWindow::slotDecryptVerify() { - if (edit->tabCount() == 0) return; + if (edit->tabCount() == 0 || edit->slotCurPageTextEdit() == nullptr) return; - if (edit->slotCurPageTextEdit() != nullptr) { - QString plainText = edit->curTextPage()->toPlainText(); + QString plainText = edit->curTextPage()->toPlainText(); #ifdef ADVANCE_SUPPORT - if (plainText.trimmed().startsWith( - GpgConstants::GPG_FRONTEND_SHORT_CRYPTO_HEAD)) { - auto cryptoText = getCryptText(plainText); - if (!cryptoText.isEmpty()) { - plainText = cryptoText; - } + if (plainText.trimmed().startsWith( + GpgConstants::GPG_FRONTEND_SHORT_CRYPTO_HEAD)) { + auto cryptoText = getCryptText(plainText); + if (!cryptoText.isEmpty()) { + plainText = cryptoText; } + } #endif - QByteArray text = plainText.toUtf8(); + QByteArray text = plainText.toUtf8(); - GpgDecrResult d_result = nullptr; - GpgVerifyResult v_result = nullptr; - gpgme_error_t error; - bool if_error = false; + GpgDecrResult d_result = nullptr; + GpgVerifyResult v_result = nullptr; + gpgme_error_t error; + bool if_error = false; #ifdef ADVANCE_SUPPORT - // Automatically import public keys that are not stored locally - if (settings.value("advanced/autoPubkeyExchange").toBool()) { - gpgme_verify_result_t tmp_v_result = nullptr; - auto thread = QThread::create( - [&]() { mCtx->verify(&text, nullptr, &tmp_v_result); }); - thread->start(); - while (thread->isRunning()) QApplication::processEvents(); - auto* checker = new UnknownSignersChecker(mCtx, tmp_v_result); - checker->start(); - checker->deleteLater(); - } + // Automatically import public keys that are not stored locally + if (settings.value("advanced/autoPubkeyExchange").toBool()) { + gpgme_verify_result_t tmp_v_result = nullptr; + auto thread = + QThread::create([&]() { mCtx->verify(&text, nullptr, &tmp_v_result); }); + thread->start(); + while (thread->isRunning()) QApplication::processEvents(); + auto* checker = new UnknownSignersChecker(mCtx, tmp_v_result); + checker->start(); + checker->deleteLater(); + } #endif - auto decrypted = std::make_unique<ByteArray>(); - process_operation(this, _("Decrypting and Verifying"), [&]() { - try { - auto buffer = text.toStdString(); - error = BasicOperator::GetInstance().DecryptVerify(buffer, decrypted, - d_result, v_result); - } catch (const std::runtime_error& e) { - if_error = true; - } - }); - - if (!if_error) { - infoBoard->associateFileTreeView(edit->curFilePage()); - - auto decrypt_res = DecryptResultAnalyse(error, std::move(d_result)); - auto verify_res = VerifyResultAnalyse(error, std::move(v_result)); - decrypt_res.analyse(); - verify_res.analyse(); - process_result_analyse(edit, infoBoard, decrypt_res, verify_res); - + auto decrypted = std::make_unique<ByteArray>(); + process_operation(this, _("Decrypting and Verifying"), [&]() { + try { + auto buffer = text.toStdString(); + error = BasicOperator::GetInstance().DecryptVerify(buffer, decrypted, + d_result, v_result); + } catch (const std::runtime_error& e) { + if_error = true; + } + }); + + if (!if_error) { + auto decrypt_res = DecryptResultAnalyse(error, std::move(d_result)); + auto verify_res = VerifyResultAnalyse(error, std::move(v_result)); + decrypt_res.analyse(); + verify_res.analyse(); + process_result_analyse(edit, infoBoard, decrypt_res, verify_res); + if (check_gpg_error_2_err_code(error) == GPG_ERR_NO_ERROR) edit->slotFillTextEditWithText(QString::fromStdString(*decrypted)); - // if (verify_res.getStatus() >= 0) { - // infoBoard->resetOptionActionsMenu(); - // infoBoard->addOptionalAction( - // "Show Verify Details", [this, error, v_result]() { - // VerifyDetailsDialog(this, mCtx, mKeyList, error, - // v_result); - // }); - // } - } else { - QMessageBox::critical(this, _("Error"), - _("An error occurred during operation.")); - return; - } + if (verify_res.getStatus() == -2) + import_unknown_key_from_keyserver(this, verify_res); + + if (verify_res.getStatus() >= 0) + show_verify_details(this, infoBoard, error, verify_res); - } else if (edit->slotCurPageFileTreeView() != nullptr) { - this->slotFileDecryptVerify(); + } else { + QMessageBox::critical(this, _("Error"), + _("An error occurred during operation.")); + return; } } @@ -522,7 +482,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); } @@ -544,6 +504,12 @@ void MainWindow::slotVersionUpgrade(const QString& currentVersion, QString(_("GpgFrontend Upgradeable (New Version: %1).")) .arg(latestVersion), 30000); + auto update_button = new QPushButton("Update GpgFrontend", this); + connect(update_button, &QPushButton::clicked, [=]() { + auto* about_dialog = new AboutDialog(2, this); + about_dialog->show(); + }); + statusBar()->addPermanentWidget(update_button, 0); } else if (currentVersion > latestVersion) { QMessageBox::warning( this, _("Unreleased Version"), diff --git a/src/ui/main_window/MainWindowSlotUI.cpp b/src/ui/main_window/MainWindowSlotUI.cpp index 35eb74ac..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); } @@ -111,7 +107,6 @@ void MainWindow::slotOpenSettingsDialog() { this->setIconSize(QSize(icon_width, icon_height)); importButton->setIconSize(QSize(icon_width, icon_height)); - fileEncButton->setIconSize(QSize(icon_width, icon_height)); // Iconstyle @@ -119,7 +114,6 @@ void MainWindow::slotOpenSettingsDialog() { auto button_style = static_cast<Qt::ToolButtonStyle>(icon_style); this->setToolButtonStyle(button_style); importButton->setToolButtonStyle(button_style); - fileEncButton->setToolButtonStyle(button_style); // restart mainwindow if necessary if (getRestartNeeded()) { diff --git a/src/ui/main_window/MainWindowUI.cpp b/src/ui/main_window/MainWindowUI.cpp index ee7a1bc0..4499b9c8 100644 --- a/src/ui/main_window/MainWindowUI.cpp +++ b/src/ui/main_window/MainWindowUI.cpp @@ -45,7 +45,8 @@ void MainWindow::createActions() { openAct->setToolTip(_("Open an existing file")); connect(openAct, SIGNAL(triggered()), edit, SLOT(slotOpen())); - browserAct = new QAction(_("Browser"), this); + browserAct = new QAction(_("File Browser"), this); + browserAct->setIcon(QIcon(":file-browser.png")); browserAct->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_B)); browserAct->setToolTip(_("Open a file browser")); connect(browserAct, SIGNAL(triggered()), this, SLOT(slotOpenFileTab())); @@ -253,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 @@ -261,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")); @@ -397,6 +406,7 @@ void MainWindow::createMenus() { helpMenu->addAction(startWizardAct); helpMenu->addSeparator(); helpMenu->addAction(checkUpdateAct); + helpMenu->addAction(translateAct); helpMenu->addAction(aboutAct); } @@ -406,10 +416,10 @@ void MainWindow::createToolBars() { fileToolBar->addAction(newTabAct); fileToolBar->addAction(openAct); fileToolBar->addAction(saveAct); - fileToolBar->hide(); + fileToolBar->addAction(browserAct); viewMenu->addAction(fileToolBar->toggleViewAction()); - cryptToolBar = addToolBar(_("Crypt")); + cryptToolBar = addToolBar(_("Operations")); cryptToolBar->setObjectName("cryptToolBar"); cryptToolBar->addAction(encryptAct); cryptToolBar->addAction(encryptSignAct); @@ -429,6 +439,7 @@ void MainWindow::createToolBars() { editToolBar->addAction(copyAct); editToolBar->addAction(pasteAct); editToolBar->addAction(selectAllAct); + editToolBar->hide(); viewMenu->addAction(editToolBar->toggleViewAction()); specialEditToolBar = addToolBar(_("Special Edit")); @@ -446,30 +457,20 @@ void MainWindow::createToolBars() { importButton->setToolTip(_("Import key from...")); importButton->setText(_("Import key")); keyToolBar->addWidget(importButton); - - // Add dropdown menu for file encryption/decryption to crypttoolbar - fileEncButton = new QToolButton(); - connect(fileEncButton, SIGNAL(clicked(bool)), this, SLOT(slotOpenFileTab())); - fileEncButton->setPopupMode(QToolButton::InstantPopup); - fileEncButton->setIcon(QIcon(":fileencryption.png")); - fileEncButton->setToolTip(_("Browser to view and operate file")); - fileEncButton->setText(_("Browser")); - fileToolBar->addWidget(fileEncButton); } void MainWindow::createStatusBar() { auto* statusBarBox = new QWidget(); auto* statusBarBoxLayout = new QHBoxLayout(); - QPixmap* pixmap; + // QPixmap* pixmap; // icon which should be shown if there are files in attachments-folder - pixmap = new QPixmap(":statusbar_icon.png"); - statusBarIcon = new QLabel(); - statusBar()->addWidget(statusBarIcon); - - statusBarIcon->setPixmap(*pixmap); - statusBar()->insertPermanentWidget(0, statusBarIcon, 0); - statusBarIcon->hide(); + // pixmap = new QPixmap(":statusbar_icon.png"); + // statusBarIcon = new QLabel(); + // statusBar()->addWidget(statusBarIcon); + // + // statusBarIcon->setPixmap(*pixmap); + // statusBar()->insertPermanentWidget(0, statusBarIcon, 0); statusBar()->showMessage(_("Ready"), 2000); statusBarBox->setLayout(statusBarBoxLayout); } @@ -483,6 +484,33 @@ void MainWindow::createDockWindows() { Qt::RightDockWidgetArea); keyListDock->setMinimumWidth(460); addDockWidget(Qt::RightDockWidgetArea, keyListDock); + + mKeyList->addListGroupTab( + _("Default"), KeyListRow::SECRET_OR_PUBLIC_KEY, + KeyListColumn::TYPE | KeyListColumn::NAME | KeyListColumn::EmailAddress | + KeyListColumn::Usage | KeyListColumn::Validity, + [](const GpgKey& key) -> bool { + return !(key.revoked() || key.disabled() || key.expired()); + }); + + mKeyList->addListGroupTab( + _("Only Public Key"), KeyListRow::SECRET_OR_PUBLIC_KEY, + KeyListColumn::TYPE | KeyListColumn::NAME | KeyListColumn::EmailAddress | + KeyListColumn::Usage | KeyListColumn::Validity, + [](const GpgKey& key) -> bool { + return !key.is_private_key() && + !(key.revoked() || key.disabled() || key.expired()); + }); + + mKeyList->addListGroupTab( + _("Has Private Key"), KeyListRow::SECRET_OR_PUBLIC_KEY, + KeyListColumn::TYPE | KeyListColumn::NAME | KeyListColumn::EmailAddress | + KeyListColumn::Usage | KeyListColumn::Validity, + [](const GpgKey& key) -> bool { + return key.is_private_key() && + !(key.revoked() || key.disabled() || key.expired()); + }); + keyListDock->setWidget(mKeyList); viewMenu->addAction(keyListDock->toggleViewAction()); 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/settings/SettingsDialog.cpp b/src/ui/settings/SettingsDialog.cpp index fcef70c7..1fbfb8db 100644 --- a/src/ui/settings/SettingsDialog.cpp +++ b/src/ui/settings/SettingsDialog.cpp @@ -105,6 +105,8 @@ void SettingsDialog::slotSetRestartNeeded(bool needed) { } void SettingsDialog::slotAccept() { + LOG(INFO) << "called"; + generalTab->applySettings(); #ifdef SMTP_SUPPORT sendMailTab->applySettings(); @@ -115,9 +117,12 @@ void SettingsDialog::slotAccept() { advancedTab->applySettings(); #endif + LOG(INFO) << "apply done"; + // write settings to filesystem GlobalSettingStation::GetInstance().Sync(); + LOG(INFO) << "restart needed" << getRestartNeeded(); if (getRestartNeeded()) { emit signalRestartNeeded(true); } @@ -131,7 +136,7 @@ QHash<QString, QString> SettingsDialog::listLanguages() { auto locale_path = GlobalSettingStation::GetInstance().GetLocaleDir(); - auto locale_dir = QDir(QString::fromStdString(locale_path.string()) ); + auto locale_dir = QDir(QString::fromStdString(locale_path.string())); QStringList file_names = locale_dir.entryList(QStringList("*")); for (int i = 0; i < file_names.size(); ++i) { diff --git a/src/ui/widgets/FilePage.cpp b/src/ui/widgets/FilePage.cpp index 2c8df5e4..d031114a 100644 --- a/src/ui/widgets/FilePage.cpp +++ b/src/ui/widgets/FilePage.cpp @@ -26,13 +26,13 @@ #include <boost/filesystem.hpp> -#include "MainWindow.h" +#include "ui/MainWindow.h" +#include "ui/SignalStation.h" namespace GpgFrontend::UI { FilePage::FilePage(QWidget* parent) : QWidget(parent) { firstParent = parent; - LOG(INFO) << "New File Page"; dirModel = new QFileSystemModel(); dirModel->setRootPath(QDir::currentPath()); @@ -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); @@ -86,8 +93,6 @@ FilePage::FilePage(QWidget* parent) : QWidget(parent) { menuLayout->setStretchFactor(pathEdit, 10); menuLayout->addWidget(goPathButton); menuLayout->setStretchFactor(goPathButton, 1); - // menuLayout->addWidget(refreshButton); - // menuLayout->setStretchFactor(refreshButton, 1); auto* layout = new QVBoxLayout(); layout->setContentsMargins(0, 0, 0, 0); @@ -99,20 +104,32 @@ FilePage::FilePage(QWidget* parent) : QWidget(parent) { this->setLayout(layout); - connect(dirTreeView, SIGNAL(clicked(const QModelIndex&)), this, - SLOT(fileTreeViewItemClicked(const QModelIndex&))); - connect(dirTreeView, SIGNAL(doubleClicked(const QModelIndex&)), this, - SLOT(fileTreeViewItemDoubleClicked(const QModelIndex&))); - connect(dirTreeView, SIGNAL(customContextMenuRequested(const QPoint&)), this, - SLOT(onCustomContextMenu(const QPoint&))); + connect(dirTreeView, &QTreeView::clicked, this, + &FilePage::fileTreeViewItemClicked); + connect(dirTreeView, &QTreeView::doubleClicked, this, + &FilePage::fileTreeViewItemDoubleClicked); + 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); + } + }); - // refresh - slotGoPath(); + connect(this, &FilePage::signalRefreshInfoBoard, SignalStation::GetInstance(), + &SignalStation::signalRefreshInfoBoard); } void FilePage::fileTreeViewItemClicked(const QModelIndex& index) { selectedPath = boost::filesystem::path( dirModel->fileInfo(index).absoluteFilePath().toStdString()); + mPath = selectedPath; LOG(INFO) << "selected path" << selectedPath; } @@ -121,51 +138,44 @@ void FilePage::slotUpLevel() { mPath = boost::filesystem::path( dirModel->fileInfo(currentRoot).absoluteFilePath().toStdString()); - + LOG(INFO) << "get path" << mPath; if (mPath.has_parent_path()) { mPath = mPath.parent_path(); - auto fileInfo = QFileInfo(QString::fromStdString(mPath.string())); - if (fileInfo.isDir() && fileInfo.isReadable() && fileInfo.isExecutable()) { - pathEdit->setText(QString::fromStdString(mPath.string())); - slotGoPath(); - } - LOG(INFO) << "Current Root mPath" << mPath; - emit pathChanged(QString::fromStdString(mPath.string())); + LOG(INFO) << "parent path" << mPath; + pathEdit->setText(mPath.string().c_str()); + slotGoPath(); } } void FilePage::fileTreeViewItemDoubleClicked(const QModelIndex& index) { - mPath = boost::filesystem::path( - dirModel->fileInfo(index).absoluteFilePath().toStdString()); - auto fileInfo = QFileInfo(QString::fromStdString(mPath.string())); - auto targetModelIndex = - dirTreeView->model()->index(index.row(), 0, index.parent()); - if (fileInfo.isDir() && fileInfo.isReadable() && fileInfo.isExecutable()) { - dirTreeView->setRootIndex(targetModelIndex); - pathEdit->setText(QString::fromStdString(mPath.string())); - } - for (int i = 1; i < dirModel->columnCount(); ++i) - dirTreeView->resizeColumnToContents(i); - LOG(INFO) << "Index mPath" << mPath; - emit pathChanged(QString::fromStdString(mPath.string())); + pathEdit->setText(dirModel->fileInfo(index).absoluteFilePath()); + slotGoPath(); } -QString FilePage::getSelected() const { return QString::fromStdString(selectedPath.string()); } +QString FilePage::getSelected() const { + return QString::fromStdString(selectedPath.string()); +} void FilePage::slotGoPath() { - qDebug() << "getSelected" << pathEdit->text(); - auto fileInfo = QFileInfo(pathEdit->text()); + const auto path_edit = pathEdit->text().toStdString(); + LOG(INFO) << "get path edit" << path_edit; + if (mPath.string() != path_edit) mPath = path_edit; + auto fileInfo = QFileInfo(mPath.string().c_str()); if (fileInfo.isDir() && fileInfo.isReadable() && fileInfo.isExecutable()) { mPath = boost::filesystem::path(fileInfo.filePath().toStdString()); - LOG(INFO) << "Set Path" << mPath; + LOG(INFO) << "set path" << mPath; dirTreeView->setRootIndex(dirModel->index(fileInfo.filePath())); - for (int i = 1; i < dirModel->columnCount(); ++i) + for (int i = 1; i < dirModel->columnCount(); ++i) { 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(QString::fromStdString(mPath.string())); + emit pathChanged(mPath.string().c_str()); } void FilePage::createPopupMenu() { @@ -173,40 +183,54 @@ void FilePage::createPopupMenu() { auto openItemAct = new QAction(_("Open"), this); connect(openItemAct, SIGNAL(triggered()), this, SLOT(slotOpenItem())); + auto renameItemAct = new QAction(_("Rename"), this); + connect(renameItemAct, SIGNAL(triggered()), this, SLOT(slotRenameItem())); auto deleteItemAct = new QAction(_("Delete"), this); connect(deleteItemAct, SIGNAL(triggered()), this, SLOT(slotDeleteItem())); - encryptItemAct = new QAction(_("Encrypt and Sign"), this); + encryptItemAct = new QAction(_("Encrypt Sign"), this); connect(encryptItemAct, SIGNAL(triggered()), this, SLOT(slotEncryptItem())); - decryptItemAct = new QAction(_("Decrypt and Verify"), this); + decryptItemAct = + new QAction(QString(_("Decrypt Verify")) + " " + _("(.gpg .asc)"), this); connect(decryptItemAct, SIGNAL(triggered()), this, SLOT(slotDecryptItem())); - signItemAct = new QAction(_("Only Sign"), this); + signItemAct = new QAction(_("Sign"), this); connect(signItemAct, SIGNAL(triggered()), this, SLOT(slotSignItem())); - verifyItemAct = new QAction(_("Only Verify"), this); + verifyItemAct = + new QAction(QString(_("Verify")) + " " + _("(.sig .gpg .asc)"), this); connect(verifyItemAct, SIGNAL(triggered()), this, SLOT(slotVerifyItem())); + hashCalculateAct = new QAction(_("Calculate Hash"), this); + connect(hashCalculateAct, SIGNAL(triggered()), this, + SLOT(slotCalculateHash())); + popUpMenu->addAction(openItemAct); + popUpMenu->addAction(renameItemAct); popUpMenu->addAction(deleteItemAct); popUpMenu->addSeparator(); popUpMenu->addAction(encryptItemAct); popUpMenu->addAction(decryptItemAct); popUpMenu->addAction(signItemAct); popUpMenu->addAction(verifyItemAct); + popUpMenu->addSeparator(); + popUpMenu->addAction(hashCalculateAct); } void FilePage::onCustomContextMenu(const QPoint& point) { QModelIndex index = dirTreeView->indexAt(point); selectedPath = boost::filesystem::path( dirModel->fileInfo(index).absoluteFilePath().toStdString()); - LOG(INFO) << "FilePage::onCustomContextMenu Right Click" << selectedPath; + LOG(INFO) << "right click" << selectedPath; if (index.isValid()) { QFileInfo info(QString::fromStdString(selectedPath.string())); encryptItemAct->setEnabled( info.isFile() && (info.suffix() != "gpg" && info.suffix() != "sig")); + encryptItemAct->setEnabled( + info.isFile() && (info.suffix() != "gpg" && info.suffix() != "sig")); decryptItemAct->setEnabled(info.isFile() && info.suffix() == "gpg"); signItemAct->setEnabled(info.isFile() && (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)); } @@ -215,21 +239,49 @@ void FilePage::onCustomContextMenu(const QPoint& point) { void FilePage::slotOpenItem() { QFileInfo info(QString::fromStdString(selectedPath.string())); if (info.isDir()) { - LOG(INFO) << "FilePage::slotOpenItem getSelected" - << pathEdit->text().toStdString(); if (info.isReadable() && info.isExecutable()) { - LOG(INFO) << "FilePage::slotOpenItem Set Path" - << info.filePath().toStdString(); - dirTreeView->setRootIndex(dirModel->index(info.filePath())); + const auto file_path = info.filePath().toStdString(); + LOG(INFO) << "set path" << file_path; + pathEdit->setText(info.filePath()); + slotGoPath(); } else { - QMessageBox::critical(this, "Error", - "The path is unprivileged or unreachable."); + QMessageBox::critical(this, _("Error"), + _("The directory is unprivileged or unreachable.")); } } else { - auto mainWindow = qobject_cast<MainWindow*>(firstParent); - LOG(INFO) << "FilePage::slotOpenItem Open Item" << selectedPath; - auto qt_path = QString::fromStdString(selectedPath.string()); - if (mainWindow != nullptr) mainWindow->slotOpenFile(qt_path); + if (info.isReadable()) { + auto mainWindow = qobject_cast<MainWindow*>(firstParent); + LOG(INFO) << "open item" << selectedPath; + auto qt_path = QString::fromStdString(selectedPath.string()); + if (mainWindow != nullptr) mainWindow->slotOpenFile(qt_path); + } else { + QMessageBox::critical(this, _("Error"), + _("The file is unprivileged or unreachable.")); + } + } +} + +void FilePage::slotRenameItem() { + auto new_name_path = selectedPath, old_name_path = selectedPath; + auto old_name = old_name_path.filename(); + new_name_path = new_name_path.remove_filename(); + + bool ok; + auto text = + QInputDialog::getText(this, _("Rename"), _("New Filename"), + QLineEdit::Normal, old_name.string().c_str(), &ok); + if (ok && !text.isEmpty()) { + try { + new_name_path /= text.toStdString(); + LOG(INFO) << "new name path" << new_name_path; + boost::filesystem::rename(old_name_path, new_name_path); + // refresh + this->slotGoPath(); + } catch (...) { + LOG(ERROR) << "rename error" << new_name_path; + QMessageBox::critical(this, _("Error"), + _("Unable to rename the file or folder.")); + } } } @@ -271,6 +323,55 @@ void FilePage::slotVerifyItem() { if (mainWindow != nullptr) mainWindow->slotFileVerify(); } +void FilePage::slotCalculateHash() { + // Returns empty QByteArray() on failure. + QFileInfo info(QString::fromStdString(selectedPath.string())); + + if (info.isFile() && info.isReadable()) { + std::stringstream ss; + + ss << "[#] " << _("File Hash Information") << std::endl; + ss << " " << _("filename") << _(": ") + << selectedPath.filename().string().c_str() << std::endl; + + QFile f(info.filePath()); + f.open(QFile::ReadOnly); + auto buffer = f.readAll(); + LOG(INFO) << "buffer size" << buffer.size(); + f.close(); + if (f.open(QFile::ReadOnly)) { + auto hash_md5 = QCryptographicHash(QCryptographicHash::Md5); + // md5 + hash_md5.addData(buffer); + auto md5 = hash_md5.result().toHex().toStdString(); + LOG(INFO) << "md5" << md5; + 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; + + 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 << std::endl; + + emit signalRefreshInfoBoard(ss.str().c_str(), + InfoBoardStatus::INFO_ERROR_OK); + } + } +} + void FilePage::keyPressEvent(QKeyEvent* event) { qDebug() << "Key Press" << event->key(); if (event->key() == Qt::Key_Return || event->key() == Qt::Key_Enter) { diff --git a/src/ui/widgets/FilePage.h b/src/ui/widgets/FilePage.h index 31be81f3..2a9f5b57 100644 --- a/src/ui/widgets/FilePage.h +++ b/src/ui/widgets/FilePage.h @@ -28,6 +28,7 @@ #include <boost/filesystem.hpp> #include "ui/GpgFrontendUI.h" +#include "ui/widgets/InfoBoardWidget.h" namespace GpgFrontend::UI { @@ -38,25 +39,30 @@ class FilePage : public QWidget { [[nodiscard]] QString getSelected() const; - void createPopupMenu(); + public slots: + void slotGoPath(); signals: void pathChanged(const QString& path); + void signalRefreshInfoBoard(const QString& text, + InfoBoardStatus verify_label_status); + private slots: void fileTreeViewItemClicked(const QModelIndex& index); void fileTreeViewItemDoubleClicked(const QModelIndex& index); void slotUpLevel(); - void slotGoPath(); void slotOpenItem(); + void slotRenameItem(); void slotDeleteItem(); void slotEncryptItem(); void slotDecryptItem(); void slotSignItem(); void slotVerifyItem(); + void slotCalculateHash(); void onCustomContextMenu(const QPoint& point); @@ -64,9 +70,13 @@ class FilePage : public QWidget { void keyPressEvent(QKeyEvent* event) override; private: + void createPopupMenu(); + QFileSystemModel* dirModel; QTreeView* dirTreeView; QLineEdit* pathEdit; + QCompleter* pathEditCompleter; + QStringListModel* pathCompleteModel; // using boost path boost::filesystem::path mPath; @@ -81,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 cd469422..e0de75f9 100644 --- a/src/ui/widgets/InfoBoardWidget.cpp +++ b/src/ui/widgets/InfoBoardWidget.cpp @@ -24,6 +24,7 @@ #include "ui/widgets/InfoBoardWidget.h" +#include "ui/SignalStation.h" #include "ui/settings/GlobalSettingStation.h" namespace GpgFrontend::UI { @@ -45,22 +46,26 @@ InfoBoardWidget::InfoBoardWidget(QWidget* parent, KeyList* keyList) detailMenu->addAction(importFromKeyserverAct); importFromKeyserverAct->setVisible(false); - auto* actionButtonMenu = new QWidget(); - actionButtonMenu->setContentsMargins(0, 0, 0, 0); - actionButtonMenu->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum); - actionButtonMenu->setFixedHeight(36); + auto* action_button_menu = new QWidget(); + action_button_menu->setContentsMargins(0, 0, 0, 0); + action_button_menu->setSizePolicy(QSizePolicy::Preferred, + QSizePolicy::Minimum); + action_button_menu->setFixedHeight(40); actionButtonLayout = new QHBoxLayout(); - actionButtonLayout->setContentsMargins(5, 5, 5, 5); + actionButtonLayout->setContentsMargins(0, 0, 0, 0); actionButtonLayout->setSpacing(0); - actionButtonMenu->setLayout(actionButtonLayout); - auto label = new QLabel(_("Optional Actions")); + auto* label = new QLabel(_("Actions")); label->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum); label->setContentsMargins(0, 0, 0, 0); + mButtonGroup = new QButtonGroup(this); - actionButtonLayout->addWidget(label); + auto* bottom_layout = new QHBoxLayout(this); + bottom_layout->addWidget(label); actionButtonLayout->addStretch(); + bottom_layout->addLayout(actionButtonLayout); + action_button_menu->setLayout(bottom_layout); QFrame* line; line = new QFrame(this); @@ -74,13 +79,16 @@ InfoBoardWidget::InfoBoardWidget(QWidget* parent, KeyList* keyList) notificationWidgetLayout->addWidget(infoBoard); notificationWidgetLayout->setStretchFactor(infoBoard, 10); - notificationWidgetLayout->addWidget(actionButtonMenu); - notificationWidgetLayout->setStretchFactor(actionButtonMenu, 1); + notificationWidgetLayout->addWidget(action_button_menu); + notificationWidgetLayout->setStretchFactor(action_button_menu, 1); notificationWidgetLayout->addWidget(line); notificationWidgetLayout->setStretchFactor(line, 1); notificationWidgetLayout->addStretch(0); this->setLayout(notificationWidgetLayout); + connect(SignalStation::GetInstance(), &SignalStation::signalRefreshInfoBoard, + this, &InfoBoardWidget::slotRefresh); + // set default size infoBoard->resize(480, 120); resize(480, 120); @@ -145,15 +153,6 @@ void InfoBoardWidget::associateTextEdit(QTextEdit* edit) { connect(edit, SIGNAL(textChanged()), this, SLOT(slotReset())); } -void InfoBoardWidget::associateFileTreeView(FilePage* treeView) { - // if (mFileTreeView != nullptr) - // disconnect(mFileTreeView, &FilePage::pathChanged, this, - // &InfoBoardWidget::slotReset); - // this->mFileTreeView = treeView; - // connect(treeView, &FilePage::pathChanged, this, - // &InfoBoardWidget::slotReset); -} - void InfoBoardWidget::associateTabWidget(QTabWidget* tab) { if (mTextPage != nullptr) disconnect(mTextPage, SIGNAL(textChanged()), this, SLOT(slotReset())); @@ -167,7 +166,6 @@ void InfoBoardWidget::associateTabWidget(QTabWidget* tab) { } mTextPage = nullptr; - mFileTreeView = nullptr; mTabWidget = tab; connect(tab, SIGNAL(tabBarClicked(int)), this, SLOT(slotReset())); connect(tab, SIGNAL(tabCloseRequested(int)), this, SLOT(slotReset())); @@ -189,7 +187,8 @@ void InfoBoardWidget::addOptionalAction(const QString& name, * Delete All item in actionButtonLayout */ void InfoBoardWidget::resetOptionActionsMenu() { - deleteWidgetsInLayout(actionButtonLayout, 2); + // skip stretch + deleteWidgetsInLayout(actionButtonLayout, 1); } void InfoBoardWidget::slotReset() { @@ -202,6 +201,8 @@ void InfoBoardWidget::slotReset() { * @param layout target layout */ void InfoBoardWidget::deleteWidgetsInLayout(QLayout* layout, int start_index) { + LOG(INFO) << "Called"; + QLayoutItem* item; while ((item = layout->layout()->takeAt(start_index)) != nullptr) { layout->removeItem(item); diff --git a/src/ui/widgets/InfoBoardWidget.h b/src/ui/widgets/InfoBoardWidget.h index 1a13e1a2..b7239adb 100644 --- a/src/ui/widgets/InfoBoardWidget.h +++ b/src/ui/widgets/InfoBoardWidget.h @@ -26,11 +26,11 @@ #define __VERIFYNOTIFICATION_H__ #include "EditorPage.h" -#include "FilePage.h" #include "gpg/result_analyse/VerifyResultAnalyse.h" -#include "ui/VerifyDetailsDialog.h" +#include "ui/details/VerifyDetailsDialog.h" namespace GpgFrontend::UI { + /** * @details Enumeration for the status of Verifylabel */ @@ -57,8 +57,6 @@ class InfoBoardWidget : public QWidget { void associateTextEdit(QTextEdit* edit); - void associateFileTreeView(FilePage* treeView); - void associateTabWidget(QTabWidget* tab); void addOptionalAction(const QString& name, @@ -100,12 +98,11 @@ class InfoBoardWidget : public QWidget { KeyList* mKeyList; /** Table holding the keys */ QTextEdit* mTextPage{nullptr}; /** TextEdit associated to the notification */ - FilePage* mFileTreeView{ - nullptr}; /** TreeView associated to the notification */ QTabWidget* mTabWidget{ nullptr}; /** TreeView associated to the notification */ QHBoxLayout* actionButtonLayout; + QButtonGroup* mButtonGroup; void deleteWidgetsInLayout(QLayout* layout, int start_index = 0); }; diff --git a/src/ui/widgets/KeyList.cpp b/src/ui/widgets/KeyList.cpp index f9f33d78..5931e337 100644 --- a/src/ui/widgets/KeyList.cpp +++ b/src/ui/widgets/KeyList.cpp @@ -31,61 +31,24 @@ namespace GpgFrontend::UI { -KeyList::KeyList(KeyListRow::KeyType selectType, - KeyListColumn::InfoType infoType, QWidget* parent) - : QWidget(parent), - appPath(qApp->applicationDirPath()), - settings(RESOURCE_DIR(appPath) + "/conf/gpgfrontend.ini", - QSettings::IniFormat), - mSelectType(selectType), - mInfoType(infoType) { - mKeyList = new QTableWidget(this); - mKeyList->setColumnCount(7); - mKeyList->horizontalHeader()->setSectionResizeMode( - QHeaderView::ResizeToContents); - mKeyList->verticalHeader()->hide(); - mKeyList->setShowGrid(false); - mKeyList->sortByColumn(2, Qt::AscendingOrder); - mKeyList->setSelectionBehavior(QAbstractItemView::SelectRows); - mKeyList->setSelectionMode(QAbstractItemView::SingleSelection); - - // table items not editable - mKeyList->setEditTriggers(QAbstractItemView::NoEditTriggers); - // no focus (rectangle around table items) - // maybe it should focus on whole row - mKeyList->setFocusPolicy(Qt::NoFocus); - - mKeyList->setAlternatingRowColors(true); - - // Hidden Column For Purpose - if (!(mInfoType & KeyListColumn::TYPE)) { - mKeyList->setColumnHidden(1, true); - } - if (!(mInfoType & KeyListColumn::NAME)) { - mKeyList->setColumnHidden(2, true); - } - if (!(mInfoType & KeyListColumn::EmailAddress)) { - mKeyList->setColumnHidden(3, true); - } - if (!(mInfoType & KeyListColumn::Usage)) { - mKeyList->setColumnHidden(4, true); - } - if (!(mInfoType & KeyListColumn::Validity)) { - mKeyList->setColumnHidden(5, true); - } - if (!(mInfoType & KeyListColumn::FingerPrint)) { - mKeyList->setColumnHidden(6, true); - } +KeyList::KeyList(QWidget* parent) : QWidget(parent) { init(); } - QStringList labels; - labels << _("Select") << _("Type") << _("Name") << _("Email Address") - << _("Usage") << _("Validity") << _("Finger Print"); +KeyList::KeyList(KeyListRow::KeyType selectType, + KeyListColumn::InfoType infoType, + const std::function<bool(const GpgKey&)>& filter, + QWidget* parent) + : QWidget(parent) { + init(); + addListGroupTab(_("Default"), selectType, infoType, filter); +} - mKeyList->setHorizontalHeaderLabels(labels); - mKeyList->horizontalHeader()->setStretchLastSection(false); +void KeyList::init() { + mGroupTab = new QTabWidget(); + mGroupTab->setMovable(true); + mGroupTab->setTabsClosable(false); auto* layout = new QVBoxLayout; - layout->addWidget(mKeyList); + layout->addWidget(mGroupTab); layout->setContentsMargins(0, 0, 0, 0); layout->setSpacing(3); setLayout(layout); @@ -95,136 +58,97 @@ KeyList::KeyList(KeyListRow::KeyType selectType, // register key database refresh signal connect(SignalStation::GetInstance(), SIGNAL(KeyDatabaseRefresh()), this, SLOT(slotRefresh())); - connect(mKeyList, SIGNAL(doubleClicked(const QModelIndex&)), this, - SLOT(slotDoubleClicked(const QModelIndex&))); setAcceptDrops(true); - slotRefresh(); } -void KeyList::slotRefresh() { - LOG(INFO) << "KeyList::slotRefresh Called"; - - auto keyList = getChecked(); - // while filling the table, sort enabled causes errors - mKeyList->setSortingEnabled(false); - mKeyList->clearContents(); - - auto keys = GpgKeyGetter::GetInstance().FetchKey(); - - auto it = keys->begin(); - - int row_count = 0; - - while (it != keys->end()) { - if (mFilter != nullptr) { - if (!mFilter(*it)) { - it = keys->erase(it); - continue; - } - } - if (!excluded_key_ids.empty()) { - auto iterator = - std::find_if(excluded_key_ids.begin(), excluded_key_ids.end(), - [it](const auto& key_id) -> bool { - if (it->id() == key_id) - return true; - else - return false; - }); - - if (iterator != excluded_key_ids.end()) { - it = keys->erase(it); - continue; - } - } - if (mSelectType == KeyListRow::ONLY_SECRET_KEY && !it->is_private_key()) { - it = keys->erase(it); - continue; - } - row_count++; - it++; +void KeyList::addListGroupTab( + const QString& name, KeyListRow::KeyType selectType, + KeyListColumn::InfoType infoType, + const std::function<bool(const GpgKey&)>& filter) { + auto key_list = new QTableWidget(this); + if (mKeyList == nullptr) { + mKeyList = key_list; } + mGroupTab->addTab(key_list, name); + mKeyTables.emplace_back(key_list, selectType, infoType, filter); - mKeyList->setRowCount(row_count); - - int row_index = 0; - it = keys->begin(); - buffered_keys.clear(); + key_list->setColumnCount(7); + key_list->horizontalHeader()->setSectionResizeMode( + QHeaderView::ResizeToContents); + key_list->verticalHeader()->hide(); + key_list->setShowGrid(false); + key_list->sortByColumn(2, Qt::AscendingOrder); + key_list->setSelectionBehavior(QAbstractItemView::SelectRows); + key_list->setSelectionMode(QAbstractItemView::SingleSelection); - while (it != keys->end()) { - buffered_keys.push_back(GpgKeyGetter::GetInstance().GetKey(it->id())); + // table items not editable + key_list->setEditTriggers(QAbstractItemView::NoEditTriggers); + // no focus (rectangle around table items) + // maybe it should focus on whole row + key_list->setFocusPolicy(Qt::NoFocus); - auto* tmp0 = new QTableWidgetItem(QString::number(row_index)); - tmp0->setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled | - Qt::ItemIsSelectable); - tmp0->setTextAlignment(Qt::AlignCenter); - tmp0->setCheckState(Qt::Unchecked); - mKeyList->setItem(row_index, 0, tmp0); + key_list->setAlternatingRowColors(true); - QString type_str; - QTextStream type_steam(&type_str); - if (it->is_private_key()) { - type_steam << "pub/sec"; - } else { - type_steam << "pub"; - } - - if (it->is_private_key() && !it->has_master_key()) { - type_steam << "#"; - } - auto* tmp1 = new QTableWidgetItem(type_str); - mKeyList->setItem(row_index, 1, tmp1); + // Hidden Column For Purpose + if (!(infoType & KeyListColumn::TYPE)) { + key_list->setColumnHidden(1, true); + } + if (!(infoType & KeyListColumn::NAME)) { + key_list->setColumnHidden(2, true); + } + if (!(infoType & KeyListColumn::EmailAddress)) { + key_list->setColumnHidden(3, true); + } + if (!(infoType & KeyListColumn::Usage)) { + key_list->setColumnHidden(4, true); + } + if (!(infoType & KeyListColumn::Validity)) { + key_list->setColumnHidden(5, true); + } + if (!(infoType & KeyListColumn::FingerPrint)) { + key_list->setColumnHidden(6, true); + } - auto* tmp2 = new QTableWidgetItem(QString::fromStdString(it->name())); - mKeyList->setItem(row_index, 2, tmp2); - auto* tmp3 = new QTableWidgetItem(QString::fromStdString(it->email())); - mKeyList->setItem(row_index, 3, tmp3); + QStringList labels; + labels << _("Select") << _("Type") << _("Name") << _("Email Address") + << _("Usage") << _("Validity") << _("Finger Print"); - QString usage; - QTextStream usage_steam(&usage); + key_list->setHorizontalHeaderLabels(labels); + key_list->horizontalHeader()->setStretchLastSection(false); - if (it->CanCertActual()) usage_steam << "C"; - if (it->CanEncrActual()) usage_steam << "E"; - if (it->CanSignActual()) usage_steam << "S"; - if (it->CanAuthActual()) usage_steam << "A"; + connect(key_list, &QTableWidget::doubleClicked, this, + &KeyList::slotDoubleClicked); - auto* temp_usage = new QTableWidgetItem(usage); - temp_usage->setTextAlignment(Qt::AlignCenter); - mKeyList->setItem(row_index, 4, temp_usage); + // refresh + mKeyTables.back().Refresh(); +} - auto* temp_validity = - new QTableWidgetItem(QString::fromStdString(it->owner_trust())); - temp_validity->setTextAlignment(Qt::AlignCenter); - mKeyList->setItem(row_index, 5, temp_validity); +void KeyList::slotRefresh() { + LOG(INFO) << _("called"); - auto* temp_fpr = new QTableWidgetItem(QString::fromStdString(it->fpr())); - temp_fpr->setTextAlignment(Qt::AlignCenter); - mKeyList->setItem(row_index, 6, temp_fpr); + for (auto& key_table : mKeyTables) { + key_table.Refresh(); + } +} - // strike out expired keys - if (it->expired() || it->revoked()) { - QFont strike = tmp2->font(); - strike.setStrikeOut(true); - tmp0->setFont(strike); - temp_usage->setFont(strike); - temp_fpr->setFont(strike); - temp_validity->setFont(strike); - tmp1->setFont(strike); - tmp2->setFont(strike); - tmp3->setFont(strike); +KeyIdArgsListPtr KeyList::getChecked(const KeyTable& key_table) { + auto ret = std::make_unique<KeyIdArgsList>(); + for (int i = 0; i < key_table.key_list->rowCount(); i++) { + if (key_table.key_list->item(i, 0)->checkState() == Qt::Checked) { + ret->push_back(key_table.buffered_keys[i].id()); } - it++; - ++row_index; } - - setChecked(keyList); + return ret; } KeyIdArgsListPtr KeyList::getChecked() { + auto key_list = qobject_cast<QTableWidget*>(mGroupTab->currentWidget()); + const auto& buffered_keys = + mKeyTables[mGroupTab->currentIndex()].buffered_keys; auto ret = std::make_unique<KeyIdArgsList>(); - for (int i = 0; i < mKeyList->rowCount(); i++) { - if (mKeyList->item(i, 0)->checkState() == Qt::Checked) { + for (int i = 0; i < key_list->rowCount(); i++) { + if (key_list->item(i, 0)->checkState() == Qt::Checked) { ret->push_back(buffered_keys[i].id()); } } @@ -232,9 +156,12 @@ KeyIdArgsListPtr KeyList::getChecked() { } KeyIdArgsListPtr KeyList::getAllPrivateKeys() { + auto key_list = qobject_cast<QTableWidget*>(mGroupTab->currentWidget()); + const auto& buffered_keys = + mKeyTables[mGroupTab->currentIndex()].buffered_keys; auto ret = std::make_unique<KeyIdArgsList>(); - for (int i = 0; i < mKeyList->rowCount(); i++) { - if (mKeyList->item(i, 1) && buffered_keys[i].is_private_key()) { + for (int i = 0; i < key_list->rowCount(); i++) { + if (key_list->item(i, 1) && buffered_keys[i].is_private_key()) { ret->push_back(buffered_keys[i].id()); } } @@ -243,21 +170,44 @@ KeyIdArgsListPtr KeyList::getAllPrivateKeys() { KeyIdArgsListPtr KeyList::getPrivateChecked() { auto ret = std::make_unique<KeyIdArgsList>(); - for (int i = 0; i < mKeyList->rowCount(); i++) { - if ((mKeyList->item(i, 0)->checkState() == Qt::Checked) && - (mKeyList->item(i, 1))) { + if (mGroupTab->size().isEmpty()) return ret; + + auto key_list = qobject_cast<QTableWidget*>(mGroupTab->currentWidget()); + const auto& buffered_keys = + mKeyTables[mGroupTab->currentIndex()].buffered_keys; + + for (int i = 0; i < key_list->rowCount(); i++) { + if ((key_list->item(i, 0)->checkState() == Qt::Checked) && + (key_list->item(i, 1))) { ret->push_back(buffered_keys[i].id()); } } return ret; } +void KeyList::setChecked(const KeyIdArgsListPtr& keyIds, + const KeyTable& key_table) { + if (!keyIds->empty()) { + for (int i = 0; i < key_table.key_list->rowCount(); i++) { + if (std::find(keyIds->begin(), keyIds->end(), + key_table.buffered_keys[i].id()) != keyIds->end()) { + key_table.key_list->item(i, 0)->setCheckState(Qt::Checked); + } + } + } +} + void KeyList::setChecked(const KeyIdArgsListPtr& keyIds) { + if (mGroupTab->size().isEmpty()) return; + auto key_list = qobject_cast<QTableWidget*>(mGroupTab->currentWidget()); + const auto& buffered_keys = + mKeyTables[mGroupTab->currentIndex()].buffered_keys; + if (!keyIds->empty()) { - for (int i = 0; i < mKeyList->rowCount(); i++) { + for (int i = 0; i < key_list->rowCount(); i++) { if (std::find(keyIds->begin(), keyIds->end(), buffered_keys[i].id()) != keyIds->end()) { - mKeyList->item(i, 0)->setCheckState(Qt::Checked); + key_list->item(i, 0)->setCheckState(Qt::Checked); } } } @@ -265,9 +215,14 @@ void KeyList::setChecked(const KeyIdArgsListPtr& keyIds) { KeyIdArgsListPtr KeyList::getSelected() { auto ret = std::make_unique<KeyIdArgsList>(); + if (mGroupTab->size().isEmpty()) return ret; - for (int i = 0; i < mKeyList->rowCount(); i++) { - if (mKeyList->item(i, 0)->isSelected() == 1) { + auto key_list = qobject_cast<QTableWidget*>(mGroupTab->currentWidget()); + const auto& buffered_keys = + mKeyTables[mGroupTab->currentIndex()].buffered_keys; + + for (int i = 0; i < key_list->rowCount(); i++) { + if (key_list->item(i, 0)->isSelected() == 1) { ret->push_back(buffered_keys[i].id()); } } @@ -275,6 +230,9 @@ KeyIdArgsListPtr KeyList::getSelected() { } [[maybe_unused]] bool KeyList::containsPrivateKeys() { + if (mGroupTab->size().isEmpty()) return false; + mKeyList = qobject_cast<QTableWidget*>(mGroupTab->currentWidget()); + for (int i = 0; i < mKeyList->rowCount(); i++) { if (mKeyList->item(i, 1)) { return true; @@ -284,10 +242,16 @@ KeyIdArgsListPtr KeyList::getSelected() { } void KeyList::setColumnWidth(int row, int size) { + if (mGroupTab->size().isEmpty()) return; + mKeyList = qobject_cast<QTableWidget*>(mGroupTab->currentWidget()); + mKeyList->setColumnWidth(row, size); } void KeyList::contextMenuEvent(QContextMenuEvent* event) { + if (mGroupTab->size().isEmpty()) return; + mKeyList = qobject_cast<QTableWidget*>(mGroupTab->currentWidget()); + if (mKeyList->selectedItems().length() > 0) { popupMenu->exec(event->globalPos()); } @@ -374,18 +338,10 @@ void KeyList::importKeys(const QByteArray& inBuffer) { new KeyImportDetailDialog(result, false, this); } -void KeyList::setExcludeKeys(std::initializer_list<std::string> key_ids) { - excluded_key_ids.clear(); - for (auto& key_id : key_ids) { - excluded_key_ids.push_back(key_id); - } -} - -void KeyList::setFilter(std::function<bool(const GpgKey&)> filter) { - this->mFilter = std::move(filter); -} - void KeyList::slotDoubleClicked(const QModelIndex& index) { + if (mGroupTab->size().isEmpty()) return; + const auto& buffered_keys = + mKeyTables[mGroupTab->currentIndex()].buffered_keys; if (mAction != nullptr) { const auto key = GpgKeyGetter::GetInstance().GetKey(buffered_keys[index.row()].id()); @@ -399,6 +355,10 @@ void KeyList::setDoubleClickedAction( } std::string KeyList::getSelectedKey() { + if (mGroupTab->size().isEmpty()) return {}; + const auto& buffered_keys = + mKeyTables[mGroupTab->currentIndex()].buffered_keys; + for (int i = 0; i < mKeyList->rowCount(); i++) { if (mKeyList->item(i, 0)->isSelected() == 1) { return buffered_keys[i].id(); @@ -407,4 +367,128 @@ std::string KeyList::getSelectedKey() { return {}; } +KeyIdArgsListPtr KeyTable::GetChecked() { + auto ret = std::make_unique<KeyIdArgsList>(); + for (int i = 0; i < key_list->rowCount(); i++) { + if (key_list->item(i, 0)->checkState() == Qt::Checked) { + ret->push_back(buffered_keys[i].id()); + } + } + return ret; +} + +void KeyTable::SetChecked(const KeyIdArgsListPtr& key_ids) { + if (!key_ids->empty()) { + for (int i = 0; i < key_list->rowCount(); i++) { + if (std::find(key_ids->begin(), key_ids->end(), buffered_keys[i].id()) != + key_ids->end()) { + key_list->item(i, 0)->setCheckState(Qt::Checked); + } + } + } +} + +void KeyTable::Refresh() { + auto checked_key_list = GetChecked(); + // while filling the table, sort enabled causes errors + + key_list->setSortingEnabled(false); + key_list->clearContents(); + + auto keys = GpgKeyGetter::GetInstance().FetchKey(); + auto it = keys->begin(); + int row_count = 0; + + while (it != keys->end()) { + if (filter != nullptr) { + if (!filter(*it)) { + it = keys->erase(it); + continue; + } + } + if (select_type == KeyListRow::ONLY_SECRET_KEY && !it->is_private_key()) { + it = keys->erase(it); + continue; + } + row_count++; + it++; + } + + key_list->setRowCount(row_count); + + int row_index = 0; + it = keys->begin(); + + auto& table_buffered_keys = buffered_keys; + + table_buffered_keys.clear(); + + while (it != keys->end()) { + table_buffered_keys.push_back(GpgKeyGetter::GetInstance().GetKey(it->id())); + + auto* tmp0 = new QTableWidgetItem(QString::number(row_index)); + tmp0->setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled | + Qt::ItemIsSelectable); + tmp0->setTextAlignment(Qt::AlignCenter); + tmp0->setCheckState(Qt::Unchecked); + key_list->setItem(row_index, 0, tmp0); + + QString type_str; + QTextStream type_steam(&type_str); + if (it->is_private_key()) { + type_steam << "pub/sec"; + } else { + type_steam << "pub"; + } + + if (it->is_private_key() && !it->has_master_key()) { + type_steam << "#"; + } + auto* tmp1 = new QTableWidgetItem(type_str); + key_list->setItem(row_index, 1, tmp1); + + auto* tmp2 = new QTableWidgetItem(QString::fromStdString(it->name())); + key_list->setItem(row_index, 2, tmp2); + auto* tmp3 = new QTableWidgetItem(QString::fromStdString(it->email())); + key_list->setItem(row_index, 3, tmp3); + + QString usage; + QTextStream usage_steam(&usage); + + if (it->CanCertActual()) usage_steam << "C"; + if (it->CanEncrActual()) usage_steam << "E"; + if (it->CanSignActual()) usage_steam << "S"; + if (it->CanAuthActual()) usage_steam << "A"; + + auto* temp_usage = new QTableWidgetItem(usage); + temp_usage->setTextAlignment(Qt::AlignCenter); + key_list->setItem(row_index, 4, temp_usage); + + auto* temp_validity = + new QTableWidgetItem(QString::fromStdString(it->owner_trust())); + temp_validity->setTextAlignment(Qt::AlignCenter); + key_list->setItem(row_index, 5, temp_validity); + + auto* temp_fpr = new QTableWidgetItem(QString::fromStdString(it->fpr())); + temp_fpr->setTextAlignment(Qt::AlignCenter); + key_list->setItem(row_index, 6, temp_fpr); + + // strike out expired keys + if (it->expired() || it->revoked()) { + QFont strike = tmp2->font(); + strike.setStrikeOut(true); + tmp0->setFont(strike); + temp_usage->setFont(strike); + temp_fpr->setFont(strike); + temp_validity->setFont(strike); + tmp1->setFont(strike); + tmp2->setFont(strike); + tmp3->setFont(strike); + } + it++; + ++row_index; + } + + SetChecked(checked_key_list); +} } // namespace GpgFrontend::UI diff --git a/src/ui/widgets/KeyList.h b/src/ui/widgets/KeyList.h index 524b2bd0..f09ae2ac 100644 --- a/src/ui/widgets/KeyList.h +++ b/src/ui/widgets/KeyList.h @@ -25,6 +25,8 @@ #ifndef __KEYLIST_H__ #define __KEYLIST_H__ +#include <utility> + #include "gpg/GpgContext.h" #include "ui/KeyImportDetailDialog.h" namespace GpgFrontend::UI { @@ -48,6 +50,31 @@ struct KeyListColumn { static constexpr InfoType FingerPrint = 1 << 5; }; +struct KeyTable { + QTableWidget* key_list; + KeyListRow::KeyType select_type; + KeyListColumn::InfoType info_type; + std::vector<GpgKey> buffered_keys; + std::function<bool(const GpgKey&)> filter; + + KeyTable( + QTableWidget* _key_list, KeyListRow::KeyType _select_type, + KeyListColumn::InfoType _info_type, + std::function<bool(const GpgKey&)> _filter = [](const GpgKey&) -> bool { + return true; + }) + : key_list(_key_list), + select_type(_select_type), + info_type(_info_type), + filter(std::move(_filter)) {} + + void Refresh(); + + KeyIdArgsListPtr GetChecked(); + + void SetChecked(const KeyIdArgsListPtr& key_ids); +}; + class KeyList : public QWidget { Q_OBJECT @@ -55,31 +82,34 @@ class KeyList : public QWidget { explicit KeyList( KeyListRow::KeyType selectType = KeyListRow::SECRET_OR_PUBLIC_KEY, KeyListColumn::InfoType infoType = KeyListColumn::ALL, + const std::function<bool(const GpgKey&)>& filter = + [](const GpgKey&) -> bool { return true; }, QWidget* parent = nullptr); - void setExcludeKeys(std::initializer_list<std::string> key_ids); + explicit KeyList(QWidget* parent); - void setFilter(std::function<bool(const GpgKey&)> filter); + void addListGroupTab( + const QString& name, + KeyListRow::KeyType selectType = KeyListRow::SECRET_OR_PUBLIC_KEY, + KeyListColumn::InfoType infoType = KeyListColumn::ALL, + const std::function<bool(const GpgKey&)>& filter = + [](const GpgKey&) -> bool { return true; }); void setDoubleClickedAction( std::function<void(const GpgKey&, QWidget*)> action); void setColumnWidth(int row, int size); - void addMenuAction(QAction* act); - void addSeparator(); KeyIdArgsListPtr getChecked(); - + static KeyIdArgsListPtr getChecked(const KeyTable& key_table); KeyIdArgsListPtr getPrivateChecked(); - KeyIdArgsListPtr getAllPrivateKeys(); - void setChecked(const KeyIdArgsListPtr& keyIds); - + static void setChecked(const KeyIdArgsListPtr& keyIds, + const KeyTable& key_table); KeyIdArgsListPtr getSelected(); - std::string getSelectedKey(); [[maybe_unused]] static void markKeys(QStringList* keyIds); @@ -91,20 +121,19 @@ class KeyList : public QWidget { void slotRefresh(); private: + void init(); void importKeys(const QByteArray& inBuffer); QString appPath; QSettings settings; - QTableWidget* mKeyList; - QMenu* popupMenu; - QNetworkAccessManager* qnam{}; - std::vector<GpgKey> buffered_keys; - KeyListRow::KeyType mSelectType; - KeyListColumn::InfoType mInfoType; - std::vector<std::string> excluded_key_ids; + QTabWidget* mGroupTab{}; + QTableWidget* mKeyList{}; + + std::vector<KeyTable> mKeyTables; + + QMenu* popupMenu{}; - std::function<bool(const GpgKey&)> mFilter = nullptr; std::function<void(const GpgKey&, QWidget*)> mAction = nullptr; private slots: diff --git a/src/ui/widgets/SignersPicker.cpp b/src/ui/widgets/SignersPicker.cpp index 3e4b3bb5..997ee27a 100644 --- a/src/ui/widgets/SignersPicker.cpp +++ b/src/ui/widgets/SignersPicker.cpp @@ -33,14 +33,13 @@ SignersPicker::SignersPicker(QWidget* parent) : QDialog(parent) { /*Setup KeyList*/ mKeyList = new KeyList( KeyListRow::ONLY_SECRET_KEY, - KeyListColumn::NAME | KeyListColumn::EmailAddress | KeyListColumn::Usage); - - mKeyList->setFilter([](const GpgKey& key) -> bool { - if (!key.CanSignActual()) - return false; - else - return true; - }); + KeyListColumn::NAME | KeyListColumn::EmailAddress | KeyListColumn::Usage, + [](const GpgKey& key) -> bool { + if (!key.CanSignActual()) + return false; + else + return true; + }); mKeyList->slotRefresh(); diff --git a/src/ui/widgets/TOFUInfoPage.cpp b/src/ui/widgets/TOFUInfoPage.cpp new file mode 100644 index 00000000..a1f76d7a --- /dev/null +++ b/src/ui/widgets/TOFUInfoPage.cpp @@ -0,0 +1,43 @@ +/** + * This file is part of GpgFrontend. + * + * GpgFrontend 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. + * + * Foobar 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 Foobar. If not, see <https://www.gnu.org/licenses/>. + * + * The initial version of the source code is inherited from gpg4usb-team. + * Their source code version also complies with GNU General Public License. + * + * The source code version of this software was modified and released + * by Saturneric<[email protected]><[email protected]> starting on May 12, 2021. + * + */ + +#include "TOFUInfoPage.h" + +GpgFrontend::UI::TOFUInfoPage::TOFUInfoPage( + const GpgFrontend::GpgTOFUInfo &tofu_info, QWidget *parent) + : QWidget(parent) { + auto grid_layout = new QGridLayout(); + + grid_layout->addWidget(new QLabel(QString(_("Key ID")) + ": "), 0, 0); + grid_layout->addWidget(new QLabel(QString(_("Algorithm")) + ": "), 1, 0); + grid_layout->addWidget(new QLabel(QString(_("Key Size")) + ": "), 2, 0); + grid_layout->addWidget(new QLabel(QString(_("Nominal Usage")) + ": "), 3, 0); + grid_layout->addWidget(new QLabel(QString(_("Actual Usage")) + ": "), 4, 0); + grid_layout->addWidget(new QLabel(QString(_("Expires on")) + ": "), 5, 0); + grid_layout->addWidget(new QLabel(QString(_("Last Update")) + ": "), 6, 0); + grid_layout->addWidget(new QLabel(QString(_("Secret Key Existence")) + ": "), + 7, 0); + + setLayout(grid_layout); +} diff --git a/src/ui/widgets/TOFUInfoPage.h b/src/ui/widgets/TOFUInfoPage.h new file mode 100644 index 00000000..29f004d1 --- /dev/null +++ b/src/ui/widgets/TOFUInfoPage.h @@ -0,0 +1,42 @@ +/** + * This file is part of GpgFrontend. + * + * GpgFrontend 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. + * + * Foobar 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 Foobar. If not, see <https://www.gnu.org/licenses/>. + * + * The initial version of the source code is inherited from gpg4usb-team. + * Their source code version also complies with GNU General Public License. + * + * The source code version of this software was modified and released + * by Saturneric<[email protected]><[email protected]> starting on May 12, 2021. + * + */ + +#ifndef GPGFRONTEND_TOFUINFOPAGE_H +#define GPGFRONTEND_TOFUINFOPAGE_H + +#include "gpg/GpgModel.h" +#include "ui/GpgFrontendUI.h" + +namespace GpgFrontend::UI { +class TOFUInfoPage : public QWidget { + Q_OBJECT + public: + explicit TOFUInfoPage(const GpgTOFUInfo &tofu_info, + QWidget *parent = nullptr); + + private: +}; +} // namespace GpgFrontend::UI + +#endif // GPGFRONTEND_TOFUINFOPAGE_H diff --git a/src/ui/widgets/TextEdit.cpp b/src/ui/widgets/TextEdit.cpp index 8d4ea4a0..ec6c6c7a 100644 --- a/src/ui/widgets/TextEdit.cpp +++ b/src/ui/widgets/TextEdit.cpp @@ -51,7 +51,8 @@ void TextEdit::slotNewTab() { QString header = _("untitled") + QString::number(++countPage) + ".txt"; auto* page = new EditorPage(); - tabWidget->addTab(page, header); + auto index = tabWidget->addTab(page, header); + tabWidget->setTabIcon(index, QIcon(":file.png")); tabWidget->setCurrentIndex(tabWidget->count() - 1); page->getTextPage()->setFocus(); connect(page->getTextPage()->document(), SIGNAL(modificationChanged(bool)), @@ -66,10 +67,12 @@ void TextEdit::slotNewHelpTab(const QString& title, const QString& path) const { void TextEdit::slotNewFileTab() const { auto* page = new FilePage(qobject_cast<QWidget*>(parent())); - tabWidget->addTab(page, "[Browser]"); + auto index = tabWidget->addTab(page, QString()); + tabWidget->setTabIcon(index, QIcon(":file-browser.png")); tabWidget->setCurrentIndex(tabWidget->count() - 1); - connect(page, SIGNAL(pathChanged(const QString&)), this, - SLOT(slotFilePagePathChanged(const QString&))); + connect(page, &FilePage::pathChanged, this, + &TextEdit::slotFilePagePathChanged); + page->slotGoPath(); } void TextEdit::slotOpenFile(QString& path) { @@ -580,7 +583,6 @@ void TextEdit::slotFilePagePathChanged(const QString& path) const { } else { mPath = tPath; } - mPath.prepend("[Browser] "); tabWidget->setTabText(index, mPath); } diff --git a/src/ui/widgets/VerifyKeyDetailBox.cpp b/src/ui/widgets/VerifyKeyDetailBox.cpp index cd5b6641..3187e156 100644 --- a/src/ui/widgets/VerifyKeyDetailBox.cpp +++ b/src/ui/widgets/VerifyKeyDetailBox.cpp @@ -28,19 +28,19 @@ namespace GpgFrontend::UI { -VerifyKeyDetailBox::VerifyKeyDetailBox(QWidget* parent, KeyList* keyList, - gpgme_signature_t signature) - : QGroupBox(parent), mKeyList(keyList), fpr(signature->fpr) { +VerifyKeyDetailBox::VerifyKeyDetailBox(const GpgSignature& signature, + QWidget* parent) + : QGroupBox(parent), fpr(signature.fpr()) { auto* vbox = new QVBoxLayout(); - switch (gpg_err_code(signature->status)) { + switch (gpg_err_code(signature.status())) { case GPG_ERR_NO_PUBKEY: { this->setTitle("A Error Signature"); auto* importButton = new QPushButton(_("Import from keyserver")); connect(importButton, SIGNAL(clicked()), this, SLOT(slotImportFormKeyserver())); - this->setTitle(QString(_("Key not present with id 0x")) + signature->fpr); + this->setTitle(QString(_("Key not present with id 0x")) + fpr.c_str()); auto grid = new QGridLayout(); @@ -60,9 +60,9 @@ VerifyKeyDetailBox::VerifyKeyDetailBox(QWidget* parent, KeyList* keyList, vbox->addLayout(gird); } else { vbox->addWidget(new QLabel(_("Key Information is NOT Available"))); - if (signature->fpr != nullptr) { + if (!signature.fpr().empty()) { vbox->addWidget(new QLabel(QString(_("Fingerprint")) + ": " + - QString(signature->fpr))); + signature.fpr().c_str())); } } break; @@ -76,9 +76,9 @@ VerifyKeyDetailBox::VerifyKeyDetailBox(QWidget* parent, KeyList* keyList, vbox->addLayout(gird); } else { vbox->addWidget(new QLabel(_("Key Information is NOT Available"))); - if (signature->fpr != nullptr) { + if (!signature.fpr().empty()) { vbox->addWidget(new QLabel(QString(_("Fingerprint")) + ": " + - QString(signature->fpr))); + signature.fpr().c_str())); } } break; @@ -92,9 +92,9 @@ VerifyKeyDetailBox::VerifyKeyDetailBox(QWidget* parent, KeyList* keyList, vbox->addLayout(gird); } else { vbox->addWidget(new QLabel(_("Key Information is NOT Available"))); - if (signature->fpr != nullptr) { + if (!signature.fpr().empty()) { vbox->addWidget(new QLabel(QString(_("Fingerprint")) + ": " + - QString(signature->fpr))); + signature.fpr().c_str())); } } break; @@ -110,9 +110,9 @@ VerifyKeyDetailBox::VerifyKeyDetailBox(QWidget* parent, KeyList* keyList, vbox->addLayout(gird); } else { vbox->addWidget(new QLabel(_("Key Information is NOT Available"))); - if (signature->fpr != nullptr) { + if (!signature.fpr().empty()) { vbox->addWidget(new QLabel(QString(_("Fingerprint")) + ": " + - QString(signature->fpr))); + signature.fpr().c_str())); } } break; @@ -126,9 +126,9 @@ VerifyKeyDetailBox::VerifyKeyDetailBox(QWidget* parent, KeyList* keyList, vbox->addLayout(gird); } else { vbox->addWidget(new QLabel(_("Key Information is NOT Available"))); - if (signature->fpr != nullptr) { + if (!signature.fpr().empty()) { vbox->addWidget(new QLabel(QString(_("Fingerprint")) + ": " + - QString(signature->fpr))); + signature.fpr().c_str())); } } break; @@ -141,9 +141,9 @@ VerifyKeyDetailBox::VerifyKeyDetailBox(QWidget* parent, KeyList* keyList, vbox->addLayout(gird); } else { vbox->addWidget(new QLabel(_("Key Information is NOT Available"))); - if (signature->fpr != nullptr) { + if (!signature.fpr().empty()) { vbox->addWidget(new QLabel(QString(_("Fingerprint")) + ": " + - QString(signature->fpr))); + signature.fpr().c_str())); } } break; @@ -155,22 +155,14 @@ VerifyKeyDetailBox::VerifyKeyDetailBox(QWidget* parent, KeyList* keyList, void VerifyKeyDetailBox::slotImportFormKeyserver() { auto* importDialog = new KeyServerImportDialog(false, this); auto key_ids = std::make_unique<KeyIdArgsList>(); - key_ids->push_back(fpr.toStdString()); + key_ids->push_back(fpr); importDialog->slotImport(key_ids); } -QString VerifyKeyDetailBox::beautifyFingerprint(QString fingerprint) { - uint len = fingerprint.length(); - if ((len > 0) && (len % 4 == 0)) - for (uint n = 0; 4 * (n + 1) < len; ++n) - fingerprint.insert(static_cast<int>(5u * n + 4u), ' '); - return fingerprint; -} - QGridLayout* VerifyKeyDetailBox::createKeyInfoGrid( - gpgme_signature_t& signature) { + const GpgSignature& signature) { auto grid = new QGridLayout(); - GpgKey key = GpgKeyGetter::GetInstance().GetKey(signature->fpr); + GpgKey key = GpgKeyGetter::GetInstance().GetKey(fpr); if (!key.good()) return nullptr; grid->addWidget(new QLabel(QString(_("Signer Name")) + ":"), 0, 0); @@ -181,40 +173,39 @@ QGridLayout* VerifyKeyDetailBox::createKeyInfoGrid( grid->addWidget(new QLabel(QString::fromStdString(key.name())), 0, 1); grid->addWidget(new QLabel(QString::fromStdString(key.email())), 1, 1); - grid->addWidget(new QLabel(beautifyFingerprint(signature->fpr)), 2, 1); + grid->addWidget(new QLabel(beautify_fingerprint(fpr).c_str()), 2, 1); - if (signature->summary & GPGME_SIGSUM_VALID) { + if (signature.summary() & GPGME_SIGSUM_VALID) { grid->addWidget(new QLabel(_("Fully Valid")), 3, 1); } else { 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") << " "; + if (signature.summary() & GPGME_SIGSUM_GREEN) { + text_stream << _("Good") << " "; } - if (signature->summary & GPGME_SIGSUM_RED) { - textStream << _("Bad") << " "; + if (signature.summary() & GPGME_SIGSUM_RED) { + text_stream << _("Bad") << " "; } - if (signature->summary & GPGME_SIGSUM_SIG_EXPIRED) { - textStream << _("Expired") << " "; + if (signature.summary() & GPGME_SIGSUM_SIG_EXPIRED) { + text_stream << _("Expired") << " "; } - if (signature->summary & GPGME_SIGSUM_KEY_MISSING) { - textStream << _("Missing Key") << " "; + if (signature.summary() & GPGME_SIGSUM_KEY_MISSING) { + text_stream << _("Missing Key") << " "; } - if (signature->summary & GPGME_SIGSUM_KEY_REVOKED) { - textStream << _("Revoked Key") << " "; + if (signature.summary() & GPGME_SIGSUM_KEY_REVOKED) { + text_stream << _("Revoked Key") << " "; } - if (signature->summary & GPGME_SIGSUM_KEY_EXPIRED) { - textStream << _("Expired Key") << " "; + if (signature.summary() & GPGME_SIGSUM_KEY_EXPIRED) { + text_stream << _("Expired Key") << " "; } - if (signature->summary & GPGME_SIGSUM_CRL_MISSING) { - textStream << _("Missing CRL") << " "; + if (signature.summary() & GPGME_SIGSUM_CRL_MISSING) { + text_stream << _("Missing CRL") << " "; } - grid->addWidget(new QLabel(_(flags.toUtf8().constData())), 4, 1); + grid->addWidget(new QLabel(text_stream.str().c_str()), 4, 1); return grid; } diff --git a/src/ui/widgets/VerifyKeyDetailBox.h b/src/ui/widgets/VerifyKeyDetailBox.h index c1b26bb2..b01d628d 100644 --- a/src/ui/widgets/VerifyKeyDetailBox.h +++ b/src/ui/widgets/VerifyKeyDetailBox.h @@ -33,21 +33,16 @@ namespace GpgFrontend::UI { class VerifyKeyDetailBox : public QGroupBox { Q_OBJECT public: - explicit VerifyKeyDetailBox(QWidget* parent, KeyList* mKeyList, - gpgme_signature_t signature); + explicit VerifyKeyDetailBox(const GpgSignature& signature, QWidget* parent); private slots: void slotImportFormKeyserver(); private: - KeyList* mKeyList; + QGridLayout* createKeyInfoGrid(const GpgSignature& signature); - static QString beautifyFingerprint(QString fingerprint); - - static QGridLayout* createKeyInfoGrid(gpgme_signature_t& signature); - - QString fpr; + std::string fpr; }; } // namespace GpgFrontend::UI |
