diff options
.png?id=8b1a51cf25d952bfc657a508851ea1aa46008189&id2=75b950760d42c9f7d01da7ec4870253d7c0a4039){kind=link}
21 files changed, 24 insertions, 38 deletions
diff --git a/gpgfrontend.icns b/gpgfrontend.icns Binary files differindex 89b13163..b9391eb9 100644 --- a/gpgfrontend.icns +++ b/gpgfrontend.icns diff --git a/gpgfrontend.ico b/gpgfrontend.ico Binary files differindex c9581076..60333511 100644 --- a/gpgfrontend.ico +++ b/gpgfrontend.ico diff --git a/gpgfrontend.qrc b/gpgfrontend.qrc index a5b5e24e..96118c23 100644 --- a/gpgfrontend.qrc +++ b/gpgfrontend.qrc @@ -4,11 +4,7 @@ <file alias="keymgmt.png">resource/lfs/icons/keymgmt.png</file> <file alias="help.png">resource/lfs/icons/help.png</file> <file alias="button_copy.png">resource/lfs/icons/button_copy.png</file> - <file alias="gpgfrontend-logo.png">resource/lfs/icons/gpgfrontend-logo.png</file> - <file alias="banner.png">resource/lfs/icons/wizard_banner.png</file> - <file alias="logo_small.png">resource/lfs/icons/gpgfrontend-logo_small.png</file> - <file alias="keys2.jpg">resource/lfs/icons/keys12.jpg</file> - <file alias="keys3.jpg">resource/lfs/icons/keys13.jpg</file> + <file alias="logo.png">resource/lfs/icons/gpgfrontend_logo.png</file> <file alias="error.png">resource/lfs/icons/error.png</file> <file alias="info.png">resource/lfs/icons/info.png</file> <file alias="inbox.png">resource/lfs/icons/inbox.png</file> diff --git a/resource/lfs/app-image/gpgfrontend/com.bktus.gpgfrontend.png b/resource/lfs/app-image/gpgfrontend/com.bktus.gpgfrontend.png Binary files differindex 5e52593c..f50151a2 100644 --- a/resource/lfs/app-image/gpgfrontend/com.bktus.gpgfrontend.png +++ b/resource/lfs/app-image/gpgfrontend/com.bktus.gpgfrontend.png diff --git a/resource/lfs/app-image/gpgfrontend/usr/share/icons/hicolor/128x128/apps/GpgFrontend.png b/resource/lfs/app-image/gpgfrontend/usr/share/icons/hicolor/128x128/apps/GpgFrontend.png Binary files differindex 5c24791f..180f645c 100644 --- a/resource/lfs/app-image/gpgfrontend/usr/share/icons/hicolor/128x128/apps/GpgFrontend.png +++ b/resource/lfs/app-image/gpgfrontend/usr/share/icons/hicolor/128x128/apps/GpgFrontend.png diff --git a/resource/lfs/app-image/gpgfrontend/usr/share/icons/hicolor/256x256/apps/GpgFrontend.png b/resource/lfs/app-image/gpgfrontend/usr/share/icons/hicolor/256x256/apps/GpgFrontend.png Binary files differindex b3268b01..f50151a2 100644 --- a/resource/lfs/app-image/gpgfrontend/usr/share/icons/hicolor/256x256/apps/GpgFrontend.png +++ b/resource/lfs/app-image/gpgfrontend/usr/share/icons/hicolor/256x256/apps/GpgFrontend.png diff --git a/resource/lfs/app-image/gpgfrontend/usr/share/icons/hicolor/32x32/apps/GpgFrontend.png b/resource/lfs/app-image/gpgfrontend/usr/share/icons/hicolor/32x32/apps/GpgFrontend.png Binary files differindex c90e1d1d..94936fec 100644 --- a/resource/lfs/app-image/gpgfrontend/usr/share/icons/hicolor/32x32/apps/GpgFrontend.png +++ b/resource/lfs/app-image/gpgfrontend/usr/share/icons/hicolor/32x32/apps/GpgFrontend.png diff --git a/resource/lfs/hicolor/128x128/apps/com.bktus.gpgfrontend.png b/resource/lfs/hicolor/128x128/apps/com.bktus.gpgfrontend.png Binary files differindex 5c24791f..21cb6a9e 100644 --- a/resource/lfs/hicolor/128x128/apps/com.bktus.gpgfrontend.png +++ b/resource/lfs/hicolor/128x128/apps/com.bktus.gpgfrontend.png diff --git a/resource/lfs/hicolor/256x256/apps/com.bktus.gpgfrontend.png b/resource/lfs/hicolor/256x256/apps/com.bktus.gpgfrontend.png Binary files differindex b3268b01..19cc6e7f 100644 --- a/resource/lfs/hicolor/256x256/apps/com.bktus.gpgfrontend.png +++ b/resource/lfs/hicolor/256x256/apps/com.bktus.gpgfrontend.png diff --git a/resource/lfs/hicolor/32x32/apps/com.bktus.gpgfrontend.png b/resource/lfs/hicolor/32x32/apps/com.bktus.gpgfrontend.png Binary files differindex c90e1d1d..072f20d7 100644 --- a/resource/lfs/hicolor/32x32/apps/com.bktus.gpgfrontend.png +++ b/resource/lfs/hicolor/32x32/apps/com.bktus.gpgfrontend.png diff --git a/resource/lfs/icons/gpgfrontend-logo.png b/resource/lfs/icons/gpgfrontend-logo.png Binary files differdeleted file mode 100644 index 7e9841be..00000000 --- a/resource/lfs/icons/gpgfrontend-logo.png +++ /dev/null diff --git a/resource/lfs/icons/gpgfrontend-logo_small (copy).png b/resource/lfs/icons/gpgfrontend-logo_small (copy).png Binary files differdeleted file mode 100644 index d34c6c31..00000000 --- a/resource/lfs/icons/gpgfrontend-logo_small (copy).png +++ /dev/null diff --git a/resource/lfs/icons/gpgfrontend-logo_small.png b/resource/lfs/icons/gpgfrontend-logo_small.png Binary files differdeleted file mode 100644 index d34c6c31..00000000 --- a/resource/lfs/icons/gpgfrontend-logo_small.png +++ /dev/null diff --git a/resource/lfs/icons/gpgfrontend.png b/resource/lfs/icons/gpgfrontend.png Binary files differindex c90e1d1d..94936fec 100644 --- a/resource/lfs/icons/gpgfrontend.png +++ b/resource/lfs/icons/gpgfrontend.png diff --git a/resource/lfs/icons/gpgfrontend_logo.png b/resource/lfs/icons/gpgfrontend_logo.png Binary files differnew file mode 100644 index 00000000..d99342ab --- /dev/null +++ b/resource/lfs/icons/gpgfrontend_logo.png diff --git a/resource/lfs/icons/keys12.jpg b/resource/lfs/icons/keys12.jpg Binary files differdeleted file mode 100644 index acf8f8d0..00000000 --- a/resource/lfs/icons/keys12.jpg +++ /dev/null diff --git a/resource/lfs/icons/keys13.jpg b/resource/lfs/icons/keys13.jpg Binary files differdeleted file mode 100644 index 0b76c5c6..00000000 --- a/resource/lfs/icons/keys13.jpg +++ /dev/null diff --git a/resource/lfs/icons/wizard_banner.png b/resource/lfs/icons/wizard_banner.png Binary files differdeleted file mode 100644 index 7e19aeab..00000000 --- a/resource/lfs/icons/wizard_banner.png +++ /dev/null diff --git a/resource/lfs/pixmaps/com.bktus.gpgfrontend.png b/resource/lfs/pixmaps/com.bktus.gpgfrontend.png Binary files differindex b3268b01..19cc6e7f 100644 --- a/resource/lfs/pixmaps/com.bktus.gpgfrontend.png +++ b/resource/lfs/pixmaps/com.bktus.gpgfrontend.png diff --git a/src/ui/dialog/Wizard.cpp b/src/ui/dialog/Wizard.cpp index b6fa53f3..5765bd1b 100644 --- a/src/ui/dialog/Wizard.cpp +++ b/src/ui/dialog/Wizard.cpp @@ -28,7 +28,6 @@ #include "Wizard.h" -#include "core/GpgModel.h" #include "core/function/GlobalSettingStation.h" namespace GpgFrontend::UI { @@ -43,10 +42,7 @@ Wizard::Wizard(QWidget* parent) : QWizard(parent) { #endif setWindowTitle(tr("First Start Wizard")); - // http://www.flickr.com/photos/laureenp/6141822934/ - setPixmap(QWizard::WatermarkPixmap, QPixmap(":/icons/keys2.jpg")); - setPixmap(QWizard::LogoPixmap, QPixmap(":/icons/logo_small.png")); - setPixmap(QWizard::BannerPixmap, QPixmap(":/icons/banner.png")); + setPixmap(QWizard::LogoPixmap, QPixmap(":/icons/logo.png").scaled(64, 64)); int next_page_id = GlobalSettingStation::GetInstance() .GetSettings() @@ -74,10 +70,9 @@ IntroPage::IntroPage(QWidget* parent) : QWizardPage(parent) { setTitle(tr("Getting Started...")); setSubTitle(tr("... with GpgFrontend")); - auto* topLabel = new QLabel( - QString( - tr("Welcome to use GpgFrontend for decrypting and signing text or " - "file!")) + + auto* top_label = new QLabel( + tr("Welcome to use GpgFrontend for decrypting and signing text or " + "file!") + " <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.") + @@ -86,10 +81,10 @@ IntroPage::IntroPage(QWidget* parent) : QWizardPage(parent) { tr("Overview") + "</a> (" + tr("by clicking the link, the page will open in the web browser") + "). <br>"); - topLabel->setTextFormat(Qt::RichText); - topLabel->setTextInteractionFlags(Qt::TextBrowserInteraction); - topLabel->setOpenExternalLinks(true); - topLabel->setWordWrap(true); + top_label->setTextFormat(Qt::RichText); + top_label->setTextInteractionFlags(Qt::TextBrowserInteraction); + top_label->setOpenExternalLinks(true); + top_label->setWordWrap(true); // QComboBox for language selection auto* lang_label = @@ -99,7 +94,7 @@ IntroPage::IntroPage(QWidget* parent) : QWizardPage(parent) { // set layout and add widgets auto* layout = new QVBoxLayout; - layout->addWidget(topLabel); + layout->addWidget(top_label); layout->addStretch(); layout->addWidget(lang_label); @@ -115,7 +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#/manual/" + " <a href=\"https://gpgfrontend.bktus.com/index.html#/basic/" "generate-key\">" + tr("Generate Key") + "</a><hr>"); keygen_label->setTextFormat(Qt::RichText); @@ -127,11 +122,11 @@ ChoosePage::ChoosePage(QWidget* parent) : QWizardPage(parent) { 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#/manual/" + "href=\"https://gpgfrontend.bktus.com/index.html#/basic/" "encrypt-decrypt-text\">" + tr("Encrypt & Decrypt Text") + "</a> " + tr("or") + " <a " - "href=\"https://gpgfrontend.bktus.com/index.html#/manual/" + "href=\"https://gpgfrontend.bktus.com/index.html#/basic/" "sign-verify-text\">" + tr("Sign & Verify Text") + "</a><hr>"); @@ -143,11 +138,11 @@ ChoosePage::ChoosePage(QWidget* parent) : QWizardPage(parent) { 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#/manual/" + "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#/manual/" + "href=\"https://gpgfrontend.bktus.com/index.html#/basic/" "sign-verify-file\">" + tr("Sign & Verify File") + "</a><hr>"); sign_verify_text_label->setTextFormat(Qt::RichText); @@ -221,7 +216,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/manual/understand-interface" + "href=\"https://gpgfrontend.bktus.com/basic/understand-interface" "overview\">" + tr("The Online Document") + "</a>" + tr(" will get you started with GpgFrontend. Anytime you encounter " diff --git a/src/ui/dialog/help/AboutDialog.cpp b/src/ui/dialog/help/AboutDialog.cpp index e4a189a3..b26d9cc2 100644 --- a/src/ui/dialog/help/AboutDialog.cpp +++ b/src/ui/dialog/help/AboutDialog.cpp @@ -30,10 +30,7 @@ #include <openssl/opensslv.h> -#include <any> - #include "GpgFrontendBuildInfo.h" -#include "core/function/GlobalSettingStation.h" #include "core/module/ModuleManager.h" #include "ui/dialog/help/GnupgTab.h" @@ -69,7 +66,7 @@ AboutDialog::AboutDialog(int defaultIndex, QWidget* parent) main_layout->addWidget(button_box); setLayout(main_layout); - this->resize(550, 650); + this->resize(520, 620); this->setMinimumWidth(450); this->show(); } @@ -81,8 +78,10 @@ InfoTab::InfoTab(QWidget* parent) : QWidget(parent) { "core", "gpgme.version", QString{"2.0.0"}); GF_UI_LOG_DEBUG("got gpgme version from rt: {}", gpgme_version); - auto* pixmap = new QPixmap(":/icons/gpgfrontend-logo.png"); - auto* text = new QString( + auto pixmap = QPixmap(":/icons/logo.png"); + pixmap = pixmap.scaled(200, 200); + + auto text = "<center><h2>" + qApp->applicationName() + "</h2></center>" + "<center><b>" + qApp->applicationVersion() + "</b></center>" + "<center>" + GIT_VERSION + "</center>" + "<br><center>" + @@ -100,14 +99,14 @@ InfoTab::InfoTab(QWidget* parent) : QWidget(parent) { "href=\"mailto:[email protected]\">[email protected]</a>." + "<br><br> " + tr("Built with Qt") + " " + qVersion() + ", " + OPENSSL_VERSION_TEXT + " " + tr("and") + " " + "GPGME" + " " + gpgme_version + "<br>" + - tr("Built at") + " " + BUILD_TIMESTAMP + "</center>"); + tr("Built at") + " " + BUILD_TIMESTAMP + "</center>"; auto* layout = new QGridLayout(); auto* pixmap_label = new QLabel(); - pixmap_label->setPixmap(*pixmap); + pixmap_label->setPixmap(pixmap); layout->addWidget(pixmap_label, 0, 0, 1, -1, Qt::AlignCenter); auto* about_label = new QLabel(); - about_label->setText(*text); + about_label->setText(text); about_label->setWordWrap(true); about_label->setOpenExternalLinks(true); layout->addWidget(about_label, 1, 0, 1, -1); @@ -139,11 +138,7 @@ TranslatorsTab::TranslatorsTab(QWidget* parent) : QWidget(parent) { } UpdateTab::UpdateTab(QWidget* parent) : QWidget(parent) { - auto* pixmap = new QPixmap(":/icons/gpgfrontend-logo.png"); auto* layout = new QGridLayout(); - auto* pixmap_label = new QLabel(); - pixmap_label->setPixmap(*pixmap); - layout->addWidget(pixmap_label, 0, 0, 1, -1, Qt::AlignCenter); current_version_ = QString("v") + VERSION_MAJOR + "." + VERSION_MINOR + "." + VERSION_PATCH; |
.png?id=75b950760d42c9f7d01da7ec4870253d7c0a4039){kind=link}
