GpgFrontend/GpgFrontend
1
0
Fork 0
Code Issues Pull Requests Actions Releases Activity

Merge remote-tracking branch 'origin/main' into develop

Browse Source
This commit is contained in:
saturneric 2024-05-03 18:38:41 +02:00
commit 773b06ecc2
2 changed files with 23 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -33,7 +33,7 @@ GpgFrontend is **PERMANENTLY FREE** of charge. However, you can support us by
- [Developer Document](#developer-document)
- [Language Support](#language-support)
- [Supported Languages](#supported-languages)
- [Contract](#contract)
- [Contact](#contact)
- [Contributing \& Bugs Report](#contributing--bugs-report)
- [Project Maintainer](#project-maintainer)
- [Project's Logo](#projects-logo)
@ -69,9 +69,9 @@ GpgFrontend currently supports an array of languages including:
Contributors: [SHOW](TRANSLATORS)
## Contract
## Contact
Please refer to [HERE](https://www.gpgfrontend.bktus.com/#/contract) for my contact details.
Please refer to [HERE](https://www.gpgfrontend.bktus.com/contact) for my contact details.
### Contributing & Bugs Report

51
src/ui/dialog/Wizard.cpp
View File

@ -72,15 +72,14 @@ IntroPage::IntroPage(QWidget* parent) : QWizardPage(parent) {
setSubTitle(tr("... with GpgFrontend"));
auto* top_label = new QLabel(
tr("Welcome to use GpgFrontend for decrypting and signing text or "
"file!") +
tr("Welcome to GpgFrontend for decrypting and signing text or files!") +
" <br><br><a href='https://gpgfrontend.bktus.com'>GpgFrontend</a> " +
tr("is a Powerful, Easy-to-Use, Compact, Cross-Platform, and "
"Installation-Free OpenPGP Crypto Tool.") +
tr("For brief information have a look at the") +
" <a href='https://gpgfrontend.bktus.com/index.html#/overview'>" +
"Installation-Free OpenPGP Crypto Tool. ") +
tr("To get started, be sure to check out the") +
" <a href='https://gpgfrontend.bktus.com/overview/glance'>" +
tr("Overview") + "</a> (" +
tr("by clicking the link, the page will open in the web browser") +
tr("by clicking the link, the page will open in your web browser") +
"). <br>");
top_label->setTextFormat(Qt::RichText);
top_label->setTextInteractionFlags(Qt::TextBrowserInteraction);
@ -111,8 +110,7 @@ ChoosePage::ChoosePage(QWidget* parent) : QWizardPage(parent) {
auto* keygen_label = new QLabel(
tr("If you have never used GpgFrontend before and also don't own a gpg "
"key yet you may possibly want to read how to") +
" <a href=\"https://gpgfrontend.bktus.com/index.html#/basic/"
"generate-key\">" +
" <a href=\"https://gpgfrontend.bktus.com/guides/generate-key\">" +
tr("Generate Key") + "</a><hr>");
keygen_label->setTextFormat(Qt::RichText);
keygen_label->setTextInteractionFlags(Qt::TextBrowserInteraction);
@ -122,13 +120,9 @@ ChoosePage::ChoosePage(QWidget* parent) : QWizardPage(parent) {
auto* encr_decy_text_label = new QLabel(
tr("If you want to learn how to encrypt, decrypt, sign and verify text, "
"you can read ") +
"<a "
"href=\"https://gpgfrontend.bktus.com/index.html#/basic/"
"encrypt-decrypt-text\">" +
"<a href=\"https://gpgfrontend.bktus.com/guides/encrypt-decrypt-text\">" +
tr("Encrypt & Decrypt Text") + "</a> " + tr("or") +
" <a "
"href=\"https://gpgfrontend.bktus.com/index.html#/basic/"
"sign-verify-text\">" +
" <a href=\"https://gpgfrontend.bktus.com/guides/sign-verify-text\">" +
tr("Sign & Verify Text") + "</a><hr>");
encr_decy_text_label->setTextFormat(Qt::RichText);
@ -136,16 +130,12 @@ ChoosePage::ChoosePage(QWidget* parent) : QWizardPage(parent) {
encr_decy_text_label->setOpenExternalLinks(true);
encr_decy_text_label->setWordWrap(true);
auto* sign_verify_text_label =
new QLabel(tr("If you want to operate file, you can read ") +
"<a "
"href=\"https://gpgfrontend.bktus.com/index.html#/basic/"
"encrypt-decrypt-file\">" +
tr("Encrypt & Sign File") + "</a> " + tr("or") +
" <a "
"href=\"https://gpgfrontend.bktus.com/index.html#/basic/"
"sign-verify-file\">" +
tr("Sign & Verify File") + "</a><hr>");
auto* sign_verify_text_label = new QLabel(
tr("If you want to operate file, you can read ") +
"<a href=\"https://gpgfrontend.bktus.com/guides/encrypt-decrypt-file\">" +
tr("Encrypt & Sign File") + "</a> " + tr("or") +
" <a href=\"https://gpgfrontend.bktus.com/guides/sign-verify-file\">" +
tr("Sign & Verify File") + "</a><hr>");
sign_verify_text_label->setTextFormat(Qt::RichText);
sign_verify_text_label->setTextInteractionFlags(Qt::TextBrowserInteraction);
sign_verify_text_label->setOpenExternalLinks(true);
@ -162,9 +152,9 @@ ChoosePage::ChoosePage(QWidget* parent) : QWizardPage(parent) {
int ChoosePage::nextId() const { return next_page_; }
void ChoosePage::slot_jump_page(const QString& page) {
QMetaObject qmo = Wizard::staticMetaObject;
int index = qmo.indexOfEnumerator("WizardPages");
QMetaEnum m = qmo.enumerator(index);
QMetaObject const qmo = Wizard::staticMetaObject;
int const index = qmo.indexOfEnumerator("WizardPages");
QMetaEnum const m = qmo.enumerator(index);
next_page_ = m.keyToValue(page.toUtf8().data());
wizard()->next();
@ -216,9 +206,7 @@ ConclusionPage::ConclusionPage(QWidget* parent) : QWizardPage(parent) {
auto* bottom_label = new QLabel(
tr("You are ready to use GpgFrontend now.<br><br>") +
"<a "
"href=\"https://gpgfrontend.bktus.com/basic/understand-interface"
"overview\">" +
"<a href=\"https://gpgfrontend.bktus.com/guides/understand-interface\">" +
tr("The Online Document") + "</a>" +
tr(" will get you started with GpgFrontend. Anytime you encounter "
"problems, please try to find help from the documentation") +
@ -232,7 +220,8 @@ ConclusionPage::ConclusionPage(QWidget* parent) : QWizardPage(parent) {
open_help_check_box_ = new QCheckBox(tr("Open offline help."));
open_help_check_box_->setChecked(true);
dont_show_wizard_checkbox_ = new QCheckBox(tr("Dont show the wizard again."));
dont_show_wizard_checkbox_ =
new QCheckBox(tr("Don't show the wizard again."));
dont_show_wizard_checkbox_->setChecked(true);
registerField("showWizard", dont_show_wizard_checkbox_);