aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSaturneric <[email protected]>2021-12-06 20:38:05 +0000
committerSaturneric <[email protected]>2021-12-06 20:38:05 +0000
commit4f9ee73ffdda5a495d25ebf4f769a4c43aa78295 (patch)
tree7ef532525a250c485d95c1df5e4b432e169ec53c /src
parentImprove UI & Functions (diff)
downloadGpgFrontend-4f9ee73ffdda5a495d25ebf4f769a4c43aa78295.tar.gz
GpgFrontend-4f9ee73ffdda5a495d25ebf4f769a4c43aa78295.zip
Test & Improve UI
Diffstat (limited to '')
-rw-r--r--src/CMakeLists.txt9
-rw-r--r--src/gpg/GpgGenKeyInfo.cpp6
-rw-r--r--src/gpg/GpgGenKeyInfo.h9
-rw-r--r--src/gpg/function/GpgKeyManager.cpp6
-rw-r--r--src/gpg/function/GpgKeyManager.h4
-rw-r--r--src/gpg/function/GpgKeyOpera.cpp12
-rw-r--r--src/gpg/function/GpgKeyOpera.h2
-rw-r--r--src/gpg/model/GpgKey.h13
-rw-r--r--src/gpg/model/GpgKeySignature.h8
-rw-r--r--src/gpg/model/GpgSignature.h8
-rw-r--r--src/gpg/model/GpgSubKey.h8
-rw-r--r--src/main.cpp5
-rw-r--r--src/ui/MainWindow.h11
-rw-r--r--src/ui/Wizard.cpp18
-rw-r--r--src/ui/help/AboutDialog.cpp74
-rw-r--r--src/ui/help/AboutDialog.h5
-rw-r--r--src/ui/keygen/KeygenDialog.cpp3
-rw-r--r--src/ui/keygen/SubkeyGenerateDialog.cpp3
-rw-r--r--src/ui/keypair_details/KeyPairDetailTab.cpp115
-rw-r--r--src/ui/keypair_details/KeyPairDetailTab.h13
-rw-r--r--src/ui/keypair_details/KeyPairSubkeyTab.cpp32
-rw-r--r--src/ui/keypair_details/KeyPairSubkeyTab.h12
-rw-r--r--src/ui/keypair_details/KeyPairUIDTab.cpp13
-rw-r--r--src/ui/keypair_details/KeySetExpireDateDialog.cpp26
-rw-r--r--src/ui/keypair_details/KeyUIDSignDialog.cpp13
-rw-r--r--src/ui/main_window/MainWindowSlotFunction.cpp2
-rw-r--r--src/ui/main_window/MainWindowSlotUI.cpp4
-rw-r--r--src/ui/main_window/MainWindowUI.cpp15
-rw-r--r--src/ui/settings/GlobalSettingStation.h10
-rw-r--r--src/ui/widgets/FilePage.cpp43
-rw-r--r--src/ui/widgets/FilePage.h6
-rw-r--r--src/ui/widgets/InfoBoardWidget.cpp2
-rw-r--r--src/ui/widgets/VerifyKeyDetailBox.cpp19
33 files changed, 299 insertions, 230 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bf9a89c2..9ec83bc8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -92,6 +92,8 @@ if (MULTI_LANG_SUPPORT)
TARGET translations
COMMAND msgfmt --check --verbose --output-file ${CMAKE_SOURCE_DIR}/resource/locale/out/${_langName}/LC_MESSAGES/GpgFrontend.mo ${_poFile}
)
+ add_custom_command(TARGET translations
+ COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/resource/locale/out/ ${RESOURCE_OUTPUT_DIRECTORY}/locales)
endforeach ()
endif ()
@@ -111,6 +113,7 @@ if (APPLICATION_BUILD)
make_directory(${RESOURCE_OUTPUT_DIRECTORY}/locales)
file(COPY ${CMAKE_SOURCE_DIR}/resource/locale/out/ DESTINATION ${RESOURCE_OUTPUT_DIRECTORY}/locales FOLLOW_SYMLINK_CHAIN)
endif ()
+ file(COPY ${CMAKE_SOURCE_DIR}/TRANSLATORS DESTINATION ${RESOURCE_OUTPUT_DIRECTORY} FOLLOW_SYMLINK_CHAIN)
endif ()
if (APPLICATION_BUILD)
@@ -204,8 +207,9 @@ if (APPLICATION_BUILD)
set(GPGFRONTEND_AFTER_UI_LIBS ${GPGFRONTEND_AFTER_UI_LIBS} server)
endif ()
- set(GPGFRONTEND_LIBS ${GPGFRONTEND_AFTER_UI_LIBS} gpgfrontend-ui ${GPGFRONTEND_BEFORE_UI_LIBS} gpg_core easy_logging_pp)
+ set(GPGFRONTEND_LIBS ${GPGFRONTEND_AFTER_UI_LIBS} gpgfrontend-ui gpg_core ${GPGFRONTEND_BEFORE_UI_LIBS} easy_logging_pp)
set(QT_DEPENDENCY_LIBS Qt5::Network Qt5::PrintSupport Qt5::Widgets Qt5::Test Qt5::Core)
+ message(STATUS "Boost Libraries ${Boost_LIBRARIES}")
IF (MINGW)
message(STATUS "Link Application Static Library For MINGW")
@@ -216,12 +220,14 @@ if (APPLICATION_BUILD)
target_link_libraries(${AppName}
${GPGFRONTEND_LIBS}
${QT_DEPENDENCY_LIBS}
+ ${Boost_LIBRARIES}
${libintl} ${libiconv} ${libconfig} crypto ssl)
elseif (APPLE)
message(STATUS "Link Application Static Library For macOS")
target_link_libraries(${AppName}
${GPGFRONTEND_LIBS}
${QT_DEPENDENCY_LIBS}
+ ${Boost_LIBRARIES}
crypto ssl intl)
else ()
message(STATUS "Link Application Static Library For UNIX ")
@@ -232,6 +238,7 @@ if (APPLICATION_BUILD)
target_link_libraries(${AppName}
${GPGFRONTEND_LIBS}
${QT_DEPENDENCY_LIBS}
+ ${Boost_LIBRARIES}
crypto ssl pthread)
endif ()
endif ()
diff --git a/src/gpg/GpgGenKeyInfo.cpp b/src/gpg/GpgGenKeyInfo.cpp
index 07708433..4a0a99fc 100644
--- a/src/gpg/GpgGenKeyInfo.cpp
+++ b/src/gpg/GpgGenKeyInfo.cpp
@@ -147,9 +147,9 @@ void GpgFrontend::GenKeyInfo::setKeySize(int m_key_size) {
}
void GpgFrontend::GenKeyInfo::setExpired(
- const boost::gregorian::date &m_expired) {
+ const boost::posix_time::ptime &m_expired) {
using namespace boost::gregorian;
- auto current = day_clock::local_day();
+ auto current = boost::posix_time::second_clock::local_time();
if (isNonExpired() && m_expired < current + years(2)) {
GenKeyInfo::expired = m_expired;
}
@@ -157,7 +157,7 @@ void GpgFrontend::GenKeyInfo::setExpired(
void GpgFrontend::GenKeyInfo::setNonExpired(bool m_non_expired) {
using namespace boost::posix_time;
- if (!m_non_expired) this->expired = from_time_t(0).date();
+ if (!m_non_expired) this->expired = from_time_t(0);
GenKeyInfo::nonExpired = m_non_expired;
}
diff --git a/src/gpg/GpgGenKeyInfo.h b/src/gpg/GpgGenKeyInfo.h
index 53b0c9f1..14290e17 100644
--- a/src/gpg/GpgGenKeyInfo.h
+++ b/src/gpg/GpgGenKeyInfo.h
@@ -37,8 +37,9 @@ class GenKeyInfo {
std::string userid;
std::string algo;
int keySize = 2048;
- boost::gregorian::date expired =
- boost::gregorian::day_clock::local_day() + boost::gregorian::years(2);
+ boost::posix_time::ptime expired =
+ boost::posix_time::second_clock::local_time() +
+ boost::gregorian::years(2);
bool nonExpired = false;
bool noPassPhrase = false;
@@ -73,11 +74,11 @@ class GenKeyInfo {
void setKeySize(int m_key_size);
- [[nodiscard]] const boost::gregorian::date &getExpired() const {
+ [[nodiscard]] const boost::posix_time::ptime &getExpired() const {
return expired;
}
- void setExpired(const boost::gregorian::date &m_expired);
+ void setExpired(const boost::posix_time::ptime &m_expired);
[[nodiscard]] bool isNonExpired() const { return nonExpired; }
diff --git a/src/gpg/function/GpgKeyManager.cpp b/src/gpg/function/GpgKeyManager.cpp
index 9e24b3d6..998c27a7 100644
--- a/src/gpg/function/GpgKeyManager.cpp
+++ b/src/gpg/function/GpgKeyManager.cpp
@@ -33,7 +33,7 @@
bool GpgFrontend::GpgKeyManager::signKey(
const GpgFrontend::GpgKey& target, GpgFrontend::KeyArgsList& keys,
const std::string& uid,
- const std::unique_ptr<boost::gregorian::date>& expires) {
+ const std::unique_ptr<boost::posix_time::ptime>& expires) {
using namespace boost::posix_time;
BasicOperator::GetInstance().SetSigners(keys);
@@ -44,7 +44,7 @@ bool GpgFrontend::GpgKeyManager::signKey(
if (expires == nullptr)
flags |= GPGME_KEYSIGN_NOEXPIRE;
else
- expires_time_t = to_time_t(ptime(*expires));
+ expires_time_t = to_time_t(*expires);
auto err = check_gpg_error(gpgme_op_keysign(
ctx, gpgme_key_t(target), uid.c_str(), expires_time_t, flags));
@@ -70,7 +70,7 @@ bool GpgFrontend::GpgKeyManager::revSign(
bool GpgFrontend::GpgKeyManager::setExpire(
const GpgFrontend::GpgKey& key, std::unique_ptr<GpgSubKey>& subkey,
- std::unique_ptr<boost::gregorian::date>& expires) {
+ std::unique_ptr<boost::posix_time::ptime>& expires) {
using namespace boost::posix_time;
unsigned long expires_time = 0;
diff --git a/src/gpg/function/GpgKeyManager.h b/src/gpg/function/GpgKeyManager.h
index 2b07425c..01254962 100644
--- a/src/gpg/function/GpgKeyManager.h
+++ b/src/gpg/function/GpgKeyManager.h
@@ -41,13 +41,13 @@ class GpgKeyManager : public SingletonFunctionObject<GpgKeyManager> {
* @return if successful
*/
bool signKey(const GpgKey& target, KeyArgsList& keys, const std::string& uid,
- const std::unique_ptr<boost::gregorian::date>& expires);
+ const std::unique_ptr<boost::posix_time::ptime>& expires);
bool revSign(const GpgFrontend::GpgKey& key,
const GpgFrontend::SignIdArgsListPtr& signature_id);
bool setExpire(const GpgKey& key, std::unique_ptr<GpgSubKey>& subkey,
- std::unique_ptr<boost::gregorian::date>& expires);
+ std::unique_ptr<boost::posix_time::ptime>& expires);
private:
GpgContext& ctx = GpgContext::GetInstance();
diff --git a/src/gpg/function/GpgKeyOpera.cpp b/src/gpg/function/GpgKeyOpera.cpp
index d0172a31..cdf5ab24 100644
--- a/src/gpg/function/GpgKeyOpera.cpp
+++ b/src/gpg/function/GpgKeyOpera.cpp
@@ -63,17 +63,19 @@ void GpgFrontend::GpgKeyOpera::DeleteKeys(
*/
GpgFrontend::GpgError GpgFrontend::GpgKeyOpera::SetExpire(
const GpgKey& key, const SubkeyId& subkey_fpr,
- std::unique_ptr<boost::gregorian::date>& expires) {
+ std::unique_ptr<boost::posix_time::ptime>& expires) {
unsigned long expires_time = 0;
+
+ LOG(INFO) << "expires" << *expires;
+
if (expires != nullptr) {
using namespace boost::posix_time;
using namespace std::chrono;
- expires_time = to_time_t(ptime(*expires)) -
- system_clock::to_time_t(system_clock::now());
+ expires_time =
+ to_time_t(*expires) - system_clock::to_time_t(system_clock::now());
}
- LOG(INFO) << "GpgFrontend::GpgKeyOpera::SetExpire" << key.id() << subkey_fpr
- << expires_time;
+ LOG(INFO) << key.id() << subkey_fpr << expires_time;
GpgError err;
if (subkey_fpr.empty())
diff --git a/src/gpg/function/GpgKeyOpera.h b/src/gpg/function/GpgKeyOpera.h
index 568a125d..7decfd79 100644
--- a/src/gpg/function/GpgKeyOpera.h
+++ b/src/gpg/function/GpgKeyOpera.h
@@ -36,7 +36,7 @@ class GpgKeyOpera : public SingletonFunctionObject<GpgKeyOpera> {
void DeleteKeys(KeyIdArgsListPtr key_ids);
GpgError SetExpire(const GpgKey& key, const SubkeyId& subkey_fpr,
- std::unique_ptr<boost::gregorian::date>& expires);
+ std::unique_ptr<boost::posix_time::ptime>& expires);
static void GenerateRevokeCert(const GpgKey& key,
const std::string& output_file_name);
diff --git a/src/gpg/model/GpgKey.h b/src/gpg/model/GpgKey.h
index 53c074e8..3bebcd41 100644
--- a/src/gpg/model/GpgKey.h
+++ b/src/gpg/model/GpgKey.h
@@ -73,18 +73,17 @@ class GpgKey {
return gpgme_pubkey_algo_name(_key_ref->subkeys->pubkey_algo);
}
- [[nodiscard]] boost::gregorian::date last_update() const {
+ [[nodiscard]] boost::posix_time::ptime last_update() const {
return boost::posix_time::from_time_t(
- static_cast<time_t>(_key_ref->last_update))
- .date();
+ static_cast<time_t>(_key_ref->last_update));
}
- [[nodiscard]] boost::gregorian::date expires() const {
- return boost::posix_time::from_time_t(_key_ref->subkeys->expires).date();
+ [[nodiscard]] boost::posix_time::ptime expires() const {
+ return boost::posix_time::from_time_t(_key_ref->subkeys->expires);
};
- [[nodiscard]] boost::gregorian::date create_time() const {
- return boost::posix_time::from_time_t(_key_ref->subkeys->timestamp).date();
+ [[nodiscard]] boost::posix_time::ptime create_time() const {
+ return boost::posix_time::from_time_t(_key_ref->subkeys->timestamp);
};
[[nodiscard]] unsigned int length() const {
diff --git a/src/gpg/model/GpgKeySignature.h b/src/gpg/model/GpgKeySignature.h
index 70eaeb1c..d08162fc 100644
--- a/src/gpg/model/GpgKeySignature.h
+++ b/src/gpg/model/GpgKeySignature.h
@@ -46,11 +46,11 @@ class GpgKeySignature {
return gpgme_pubkey_algo_name(_signature_ref->pubkey_algo);
}
- [[nodiscard]] boost::gregorian::date create_time() const {
- return boost::posix_time::from_time_t(_signature_ref->timestamp).date();
+ [[nodiscard]] boost::posix_time::ptime create_time() const {
+ return boost::posix_time::from_time_t(_signature_ref->timestamp);
}
- [[nodiscard]] boost::gregorian::date expire_time() const {
- return boost::posix_time::from_time_t(_signature_ref->expires).date();
+ [[nodiscard]] boost::posix_time::ptime expire_time() const {
+ return boost::posix_time::from_time_t(_signature_ref->expires);
}
[[nodiscard]] std::string uid() const { return _signature_ref->uid; }
diff --git a/src/gpg/model/GpgSignature.h b/src/gpg/model/GpgSignature.h
index 347cceb1..419bf9cf 100644
--- a/src/gpg/model/GpgSignature.h
+++ b/src/gpg/model/GpgSignature.h
@@ -51,11 +51,11 @@ class GpgSignature {
return gpgme_hash_algo_name(_signature_ref->hash_algo);
}
- [[nodiscard]] boost::gregorian::date create_time() const {
- return boost::posix_time::from_time_t(_signature_ref->timestamp).date();
+ [[nodiscard]] boost::posix_time::ptime create_time() const {
+ return boost::posix_time::from_time_t(_signature_ref->timestamp);
}
- [[nodiscard]] boost::gregorian::date expire_time() const {
- return boost::posix_time::from_time_t(_signature_ref->exp_timestamp).date();
+ [[nodiscard]] boost::posix_time::ptime expire_time() const {
+ return boost::posix_time::from_time_t(_signature_ref->exp_timestamp);
}
[[nodiscard]] std::string fpr() const { return _signature_ref->fpr; }
diff --git a/src/gpg/model/GpgSubKey.h b/src/gpg/model/GpgSubKey.h
index 3ee93a0c..462dcbca 100644
--- a/src/gpg/model/GpgSubKey.h
+++ b/src/gpg/model/GpgSubKey.h
@@ -66,12 +66,12 @@ class GpgSubKey {
[[nodiscard]] bool is_cardkey() const { return _subkey_ref->is_cardkey; }
- [[nodiscard]] boost::gregorian::date timestamp() const {
- return boost::posix_time::from_time_t(_subkey_ref->timestamp).date();
+ [[nodiscard]] boost::posix_time::ptime timestamp() const {
+ return boost::posix_time::from_time_t(_subkey_ref->timestamp);
}
- [[nodiscard]] boost::gregorian::date expires() const {
- return boost::posix_time::from_time_t(_subkey_ref->expires).date();
+ [[nodiscard]] boost::posix_time::ptime expires() const {
+ return boost::posix_time::from_time_t(_subkey_ref->expires);
}
GpgSubKey() = default;
diff --git a/src/main.cpp b/src/main.cpp
index 983d062b..066231fb 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -22,6 +22,8 @@
*
*/
+#include <boost/locale.hpp>
+
#include "GpgFrontendBuildInfo.h"
#include "ui/MainWindow.h"
#include "ui/settings/GlobalSettingStation.h"
@@ -138,6 +140,9 @@ void init_locale() {
GpgFrontend::UI::GlobalSettingStation::GetInstance().Sync();
auto* locale_name = setlocale(LC_ALL, nullptr);
+ boost::locale::generator gen;
+ // Create locale generator
+ std::locale::global(gen(locale_name));
LOG(INFO) << "current system locale" << locale_name;
// read from settings file
diff --git a/src/ui/MainWindow.h b/src/ui/MainWindow.h
index 839abb98..97c5c73f 100644
--- a/src/ui/MainWindow.h
+++ b/src/ui/MainWindow.h
@@ -219,16 +219,6 @@ class MainWindow : public QMainWindow {
void slotOpenKeyManagement();
/**
- * @details Open about-dialog.
- */
- void slotAbout();
-
- /**
- * @details Open check-update-tab in about-dialog.
- */
- void slotCheckUpdate();
-
- /**
* @details Open File Opera Tab
*/
void slotOpenFileTab();
@@ -402,6 +392,7 @@ class MainWindow : public QMainWindow {
QAction* zoomOutAct{}; /** Action to zoom out */
QAction* aboutAct{}; /** Action to open about dialog */
QAction* checkUpdateAct{}; /** Action to open about dialog */
+ QAction* translateAct{}; /** Action to open about dialog */
QAction* fileEncryptAct{}; /** Action to open dialog for encrypting file */
QAction* fileDecryptAct{}; /** Action to open dialog for decrypting file */
QAction* fileSignAct{}; /** Action to open dialog for signing file */
diff --git a/src/ui/Wizard.cpp b/src/ui/Wizard.cpp
index 3df00683..9f0626ff 100644
--- a/src/ui/Wizard.cpp
+++ b/src/ui/Wizard.cpp
@@ -232,15 +232,15 @@ ConclusionPage::ConclusionPage(QWidget* parent) : QWizardPage(parent) {
setTitle(_("Ready."));
setSubTitle(_("Have fun with GpgFrontend!"));
- auto* bottomLabel =
- new QLabel(QString(_("You are ready to use GpgFrontend now.<br><br>")) +
- "<a "
- "href=\"https://saturneric.github.io/GpgFrontend/index.html#/"
- "overview\">" +
- _("The Online Document") + "</a>" +
- _(" will get you started with GpgFrontend. It will open in "
- "the main window.") +
- "<br>");
+ auto* bottomLabel = new QLabel(
+ QString(_("You are ready to use GpgFrontend now.<br><br>")) +
+ "<a "
+ "href=\"https://saturneric.github.io/GpgFrontend/index.html#/"
+ "overview\">" +
+ _("The Online Document") + "</a>" +
+ _(" will get you started with GpgFrontend. Anytime you encounter "
+ "problems, please try to find help from the documentation") +
+ "<br>");
bottomLabel->setTextFormat(Qt::RichText);
bottomLabel->setTextInteractionFlags(Qt::TextBrowserInteraction);
diff --git a/src/ui/help/AboutDialog.cpp b/src/ui/help/AboutDialog.cpp
index 72100713..1dd06933 100644
--- a/src/ui/help/AboutDialog.cpp
+++ b/src/ui/help/AboutDialog.cpp
@@ -26,6 +26,7 @@
#include "GpgFrontendBuildInfo.h"
#include "function/VersionCheckThread.h"
+#include "ui/settings/GlobalSettingStation.h"
namespace GpgFrontend::UI {
@@ -37,7 +38,7 @@ AboutDialog::AboutDialog(int defaultIndex, QWidget* parent) : QDialog(parent) {
auto* translatorsTab = new TranslatorsTab();
updateTab = new UpdateTab();
- tabWidget->addTab(infoTab, _("General"));
+ tabWidget->addTab(infoTab, _("About Software"));
tabWidget->addTab(translatorsTab, _("Translators"));
tabWidget->addTab(updateTab, _("Update"));
@@ -56,7 +57,8 @@ AboutDialog::AboutDialog(int defaultIndex, QWidget* parent) : QDialog(parent) {
mainLayout->addWidget(buttonBox);
setLayout(mainLayout);
- this->resize(320, 580);
+ this->resize(450, 580);
+ this->setMinimumWidth(450);
this->show();
}
@@ -70,20 +72,20 @@ InfoTab::InfoTab(QWidget* parent) : QWidget(parent) {
auto* text = new QString(
"<center><h2>" + qApp->applicationName() + "</h2></center>" +
"<center><b>" + qApp->applicationVersion() + "</b></center>" +
- "<center>" + GIT_VERSION + "</center>" +
- _("<br><center>GpgFrontend is an easy-to-use, compact, cross-platform, "
- "<br>"
- "and installation-free gpg front-end tool.<br>"
- "It visualizes most of the common operations of gpg commands.<br>"
- "It's licensed under the GPL v3<br><br>"
- "<b>Developer:</b><br>"
- "Saturneric<br><br>"
- "If you have any questions or suggestions, raise an issue<br/>"
- "at <a href=\"https://github.com/saturneric/GpgFrontend\">GitHub</a> "
- "or send a mail to my mailing list at <a "
- "href=\"mailto:[email protected]\">[email protected]</a>.") +
- "<br><br> " + _("Built with Qt") + " " + qVersion() + " " +
- _("and GPGME") + " " +
+ "<center>" + GIT_VERSION + "</center>" + "<br><center>" +
+ _("GpgFrontend is an easy-to-use, compact, cross-platform, "
+ "and installation-free gpg front-end tool."
+ "It visualizes most of the common operations of gpg commands."
+ "It's licensed under the GPL v3") +
+ "<br><br>"
+ "<b>" +
+ _("Developer:") + "</b><br>" + "Saturneric" + "<br><br>" +
+ _("If you have any questions or suggestions, raise an issue at") +
+ "<br/>"
+ " <a href=\"https://github.com/saturneric/GpgFrontend\">GitHub</a> " +
+ _("or send a mail to my mailing list at") + " <a " +
+ "href=\"mailto:[email protected]\">[email protected]</a>." + "<br><br> " +
+ _("Built with Qt") + " " + qVersion() + " " + _("and GPGME") + " " +
GpgFrontend::GpgContext::getGpgmeVersion().c_str() + "<br>" +
_("Built at") + " " + BUILD_TIMESTAMP + "</center>");
@@ -93,6 +95,7 @@ InfoTab::InfoTab(QWidget* parent) : QWidget(parent) {
layout->addWidget(pixmapLabel, 0, 0, 1, -1, Qt::AlignCenter);
auto* aboutLabel = new QLabel();
aboutLabel->setText(*text);
+ aboutLabel->setWordWrap(true);
aboutLabel->setOpenExternalLinks(true);
layout->addWidget(aboutLabel, 1, 0, 1, -1);
layout->addItem(
@@ -104,18 +107,31 @@ InfoTab::InfoTab(QWidget* parent) : QWidget(parent) {
TranslatorsTab::TranslatorsTab(QWidget* parent) : QWidget(parent) {
QFile translatorsFile;
- translatorsFile.setFileName(qApp->applicationDirPath() + "/About");
+ auto translators_file =
+ GlobalSettingStation::GetInstance().GetResourceDir() / "TRANSLATORS";
+ translatorsFile.setFileName(translators_file.string().c_str());
translatorsFile.open(QIODevice::ReadOnly);
QByteArray inBuffer = translatorsFile.readAll();
auto* label = new QLabel(inBuffer);
+
auto* mainLayout = new QVBoxLayout(this);
mainLayout->addWidget(label);
+ mainLayout->addStretch();
+
+ auto notice_label = new QLabel(
+ _("If you think there are any problems with the translation, why not "
+ "participate in the translation work? If you want to participate, "
+ "please "
+ "read the document or contact me via email."),
+ this);
+ notice_label->setWordWrap(true);
+ mainLayout->addWidget(notice_label);
setLayout(mainLayout);
}
-UpdateTab::UpdateTab(QWidget* parent) {
+UpdateTab::UpdateTab(QWidget* parent) : QWidget(parent) {
auto* pixmap = new QPixmap(":gpgfrontend-logo.png");
auto* layout = new QGridLayout();
auto* pixmapLabel = new QLabel();
@@ -131,7 +147,7 @@ UpdateTab::UpdateTab(QWidget* parent) {
"<center>" +
QString(_("It is recommended that you always check the version "
"of GpgFrontend and upgrade to the latest version.")) +
- "</center><br><center>" +
+ "</center><center>" +
_("New versions not only represent new features, but "
"also often represent functional and security fixes.") +
"</center>");
@@ -149,13 +165,12 @@ UpdateTab::UpdateTab(QWidget* parent) {
upgradeLabel = new QLabel();
upgradeLabel->setText(
"<center>" +
- QString(
- _("The current version is inconsistent with the latest version on "
- "github.")) +
- "</center><br><center>" + _("Please click") +
+ QString(_("The current version is less than the latest version on "
+ "github.")) +
+ "</center><center>" + _("Please click") +
" <a "
- "href=\"https://github.com/saturneric/GpgFrontend/releases\">here</a> " +
- _("to download the latest version.") + "</center>");
+ "href=\"https://github.com/saturneric/GpgFrontend/releases\">" +
+ _("Here") + "</a> " + _("to download the latest version.") + "</center>");
upgradeLabel->setWordWrap(true);
upgradeLabel->setOpenExternalLinks(true);
upgradeLabel->setHidden(true);
@@ -173,16 +188,13 @@ UpdateTab::UpdateTab(QWidget* parent) {
new QSpacerItem(20, 10, QSizePolicy::Minimum, QSizePolicy::Fixed), 2, 1,
1, 1);
- connect(this, SIGNAL(replyFromUpdateServer(QByteArray)), this,
- SLOT(processReplyDataFromUpdateServer(QByteArray)));
-
setLayout(layout);
}
void UpdateTab::getLatestVersion() {
this->pb->setHidden(false);
- LOG(INFO) << "try to get latest version";
+ LOG(INFO) << _("try to get latest version");
QString base_url =
"https://api.github.com/repos/saturneric/gpgfrontend/releases/latest";
@@ -205,6 +217,10 @@ void UpdateTab::slotShowVersionStatus(const QString& current,
latestVersionLabel->setText("<center><b>" +
QString(_("Latest Version From Github")) + ": " +
server + "</b></center>");
+
+ if (true || current < server) {
+ upgradeLabel->show();
+ }
}
} // namespace GpgFrontend::UI
diff --git a/src/ui/help/AboutDialog.h b/src/ui/help/AboutDialog.h
index 4d43600e..78c98149 100644
--- a/src/ui/help/AboutDialog.h
+++ b/src/ui/help/AboutDialog.h
@@ -59,14 +59,11 @@ class UpdateTab : public QWidget {
Q_OBJECT
QLabel* currentVersionLabel;
-
QLabel* latestVersionLabel;
-
QLabel* upgradeLabel;
-
QProgressBar* pb;
-
QString currentVersion;
+ QPushButton* downloadButton;
QNetworkAccessManager* manager = new QNetworkAccessManager(this);
diff --git a/src/ui/keygen/KeygenDialog.cpp b/src/ui/keygen/KeygenDialog.cpp
index 382be5cb..bcbdbffa 100644
--- a/src/ui/keygen/KeygenDialog.cpp
+++ b/src/ui/keygen/KeygenDialog.cpp
@@ -106,8 +106,7 @@ void KeyGenDialog::slotKeyGenAccept() {
genKeyInfo->setNonExpired(true);
} else {
genKeyInfo->setExpired(
- boost::posix_time::from_time_t(dateEdit->dateTime().toTime_t())
- .date());
+ boost::posix_time::from_time_t(dateEdit->dateTime().toTime_t()));
}
gpgme_error_t error = false;
diff --git a/src/ui/keygen/SubkeyGenerateDialog.cpp b/src/ui/keygen/SubkeyGenerateDialog.cpp
index 593b1cae..53ecd8e3 100644
--- a/src/ui/keygen/SubkeyGenerateDialog.cpp
+++ b/src/ui/keygen/SubkeyGenerateDialog.cpp
@@ -234,8 +234,7 @@ void SubkeyGenerateDialog::slotKeyGenAccept() {
genKeyInfo->setNonExpired(true);
} else {
genKeyInfo->setExpired(
- boost::posix_time::from_time_t(dateEdit->dateTime().toTime_t())
- .date());
+ boost::posix_time::from_time_t(dateEdit->dateTime().toTime_t()));
}
GpgError error;
diff --git a/src/ui/keypair_details/KeyPairDetailTab.cpp b/src/ui/keypair_details/KeyPairDetailTab.cpp
index 3e1ec319..916aa6a1 100644
--- a/src/ui/keypair_details/KeyPairDetailTab.cpp
+++ b/src/ui/keypair_details/KeyPairDetailTab.cpp
@@ -24,6 +24,8 @@
#include "ui/keypair_details/KeyPairDetailTab.h"
+#include <boost/locale.hpp>
+
#include "gpg/function/GpgKeyGetter.h"
#include "gpg/function/GpgKeyImportExportor.h"
#include "gpg/function/GpgKeyOpera.h"
@@ -55,31 +57,9 @@ KeyPairDetailTab::KeyPairDetailTab(const std::string& key_id, QWidget* parent)
keySizeVarLabel = new QLabel();
expireVarLabel = new QLabel();
createdVarLabel = new QLabel();
+ lastUpdateVarLabel = new QLabel();
algorithmVarLabel = new QLabel();
-
- // Show the situation that master key not exists.
- masterKeyExistVarLabel =
- new QLabel(mKey.has_master_key() ? _("Exists") : _("Not Exists"));
- if (!mKey.has_master_key()) {
- auto paletteExpired = masterKeyExistVarLabel->palette();
- paletteExpired.setColor(masterKeyExistVarLabel->foregroundRole(), Qt::red);
- masterKeyExistVarLabel->setPalette(paletteExpired);
- } else {
- auto paletteValid = masterKeyExistVarLabel->palette();
- paletteValid.setColor(masterKeyExistVarLabel->foregroundRole(),
- Qt::darkGreen);
- masterKeyExistVarLabel->setPalette(paletteValid);
- }
-
- if (mKey.expired()) {
- auto paletteExpired = expireVarLabel->palette();
- paletteExpired.setColor(expireVarLabel->foregroundRole(), Qt::red);
- expireVarLabel->setPalette(paletteExpired);
- } else {
- auto paletteValid = expireVarLabel->palette();
- paletteValid.setColor(expireVarLabel->foregroundRole(), Qt::darkGreen);
- expireVarLabel->setPalette(paletteValid);
- }
+ masterKeyExistVarLabel = new QLabel();
auto* mvbox = new QVBoxLayout();
auto* vboxKD = new QGridLayout();
@@ -97,26 +77,28 @@ KeyPairDetailTab::KeyPairDetailTab(const std::string& key_id, QWidget* parent)
vboxKD->addWidget(new QLabel(QString(_("Key Size")) + ": "), 2, 0);
vboxKD->addWidget(new QLabel(QString(_("Nominal Usage")) + ": "), 3, 0);
vboxKD->addWidget(new QLabel(QString(_("Actual Usage")) + ": "), 4, 0);
- vboxKD->addWidget(new QLabel(QString(_("Expires on")) + ": "), 5, 0);
- vboxKD->addWidget(new QLabel(QString(_("Last Update")) + ": "), 6, 0);
- vboxKD->addWidget(new QLabel(QString(_("Secret Key Existence")) + ": "), 7,
+ vboxKD->addWidget(new QLabel(QString(_("Create Date")) + ": "), 5, 0);
+ vboxKD->addWidget(new QLabel(QString(_("Expires on")) + ": "), 6, 0);
+ vboxKD->addWidget(new QLabel(QString(_("Last Update")) + ": "), 7, 0);
+ vboxKD->addWidget(new QLabel(QString(_("Master Key Existence")) + ": "), 8,
0);
vboxKD->addWidget(keySizeVarLabel, 2, 1);
- vboxKD->addWidget(expireVarLabel, 5, 1);
+ vboxKD->addWidget(expireVarLabel, 6, 1);
vboxKD->addWidget(algorithmVarLabel, 1, 1);
- vboxKD->addWidget(createdVarLabel, 6, 1);
+ vboxKD->addWidget(createdVarLabel, 5, 1);
+ vboxKD->addWidget(lastUpdateVarLabel, 7, 1);
vboxKD->addWidget(keyidVarLabel, 0, 1);
vboxKD->addWidget(usageVarLabel, 3, 1);
vboxKD->addWidget(actualUsageVarLabel, 4, 1);
- vboxKD->addWidget(masterKeyExistVarLabel, 7, 1);
+ vboxKD->addWidget(masterKeyExistVarLabel, 8, 1);
ownerBox->setLayout(vboxOD);
mvbox->addWidget(ownerBox);
keyBox->setLayout(vboxKD);
mvbox->addWidget(keyBox);
- fingerPrintVarLabel = new QLabel(beautify_fingerprint(mKey.fpr()).c_str());
+ fingerPrintVarLabel = new QLabel();
fingerPrintVarLabel->setWordWrap(false);
fingerPrintVarLabel->setTextInteractionFlags(Qt::TextSelectableByMouse);
fingerPrintVarLabel->setStyleSheet("margin-left: 0; margin-right: 5;");
@@ -305,51 +287,80 @@ void KeyPairDetailTab::slotModifyEditDatetime() {
}
void KeyPairDetailTab::slotRefreshKeyInfo() {
+ // Show the situation that master key not exists.
+ masterKeyExistVarLabel->setText(mKey.has_master_key() ? _("Exists")
+ : _("Not Exists"));
+ if (!mKey.has_master_key()) {
+ auto paletteExpired = masterKeyExistVarLabel->palette();
+ paletteExpired.setColor(masterKeyExistVarLabel->foregroundRole(), Qt::red);
+ masterKeyExistVarLabel->setPalette(paletteExpired);
+ } else {
+ auto paletteValid = masterKeyExistVarLabel->palette();
+ paletteValid.setColor(masterKeyExistVarLabel->foregroundRole(),
+ Qt::darkGreen);
+ masterKeyExistVarLabel->setPalette(paletteValid);
+ }
+
+ if (mKey.expired()) {
+ auto paletteExpired = expireVarLabel->palette();
+ paletteExpired.setColor(expireVarLabel->foregroundRole(), Qt::red);
+ expireVarLabel->setPalette(paletteExpired);
+ } else {
+ auto paletteValid = expireVarLabel->palette();
+ paletteValid.setColor(expireVarLabel->foregroundRole(), Qt::darkGreen);
+ expireVarLabel->setPalette(paletteValid);
+ }
+
nameVarLabel->setText(QString::fromStdString(mKey.name()));
emailVarLabel->setText(QString::fromStdString(mKey.email()));
commentVarLabel->setText(QString::fromStdString(mKey.comment()));
keyidVarLabel->setText(QString::fromStdString(mKey.id()));
- QString usage;
- QTextStream usage_steam(&usage);
+ std::stringstream usage_steam;
- if (mKey.can_certify()) usage_steam << _("Cert") << " ";
- if (mKey.can_encrypt()) usage_steam << _("Encr") << " ";
+ if (mKey.can_certify()) usage_steam << _("Certificate") << " ";
+ if (mKey.can_encrypt()) usage_steam << _("Encrypt") << " ";
if (mKey.can_sign()) usage_steam << _("Sign") << " ";
if (mKey.can_authenticate()) usage_steam << _("Auth") << " ";
- usageVarLabel->setText(usage);
+ usageVarLabel->setText(usage_steam.str().c_str());
- QString actualUsage;
- QTextStream actual_usage_steam(&actualUsage);
+ std::stringstream actual_usage_steam;
- if (mKey.CanCertActual()) actual_usage_steam << _("Cert") << " ";
- if (mKey.CanEncrActual()) actual_usage_steam << _("Encr") << " ";
+ if (mKey.CanCertActual()) actual_usage_steam << _("Certificate") << " ";
+ if (mKey.CanEncrActual()) actual_usage_steam << _("Encrypt") << " ";
if (mKey.CanSignActual()) actual_usage_steam << _("Sign") << " ";
if (mKey.CanAuthActual()) actual_usage_steam << _("Auth") << " ";
- actualUsageVarLabel->setText(actualUsage);
+ actualUsageVarLabel->setText(actual_usage_steam.str().c_str());
- QString keySizeVal, keyExpireVal, keyCreateTimeVal, keyAlgoVal;
+ std::string key_size_val, key_expire_val, key_create_time_val, key_algo_val,
+ key_last_update_val;
- keySizeVal = QString::number(mKey.length());
+ key_size_val = std::to_string(mKey.length());
if (to_time_t(boost::posix_time::ptime(mKey.expires())) == 0) {
- keyExpireVal = _("Never Expire");
+ expireVarLabel->setText(_("Never Expire"));
} else {
- keyExpireVal =
- QString::fromStdString(boost::gregorian::to_iso_string(mKey.expires()));
+ expireVarLabel->setText(QLocale::system().toString(
+ QDateTime::fromTime_t(to_time_t(mKey.expires()))));
}
- keyAlgoVal = QString::fromStdString(mKey.pubkey_algo());
- keyCreateTimeVal = QString::fromStdString(to_iso_string(mKey.create_time()));
+ key_algo_val = mKey.pubkey_algo();
- keySizeVarLabel->setText(keySizeVal);
- expireVarLabel->setText(keyExpireVal);
- createdVarLabel->setText(keyCreateTimeVal);
- algorithmVarLabel->setText(keyAlgoVal);
+ createdVarLabel->setText(QLocale::system().toString(
+ QDateTime::fromTime_t(to_time_t(mKey.create_time()))));
+
+ if (to_time_t(boost::posix_time::ptime(mKey.last_update())) == 0) {
+ lastUpdateVarLabel->setText(_("No Data"));
+ } else {
+ lastUpdateVarLabel->setText(QLocale::system().toString(
+ QDateTime::fromTime_t(to_time_t(mKey.last_update()))));
+ }
+ keySizeVarLabel->setText(key_size_val.c_str());
+ algorithmVarLabel->setText(key_algo_val.c_str());
fingerPrintVarLabel->setText(beautify_fingerprint(mKey.fpr()).c_str());
}
diff --git a/src/ui/keypair_details/KeyPairDetailTab.h b/src/ui/keypair_details/KeyPairDetailTab.h
index 534014e5..0791344c 100644
--- a/src/ui/keypair_details/KeyPairDetailTab.h
+++ b/src/ui/keypair_details/KeyPairDetailTab.h
@@ -77,12 +77,13 @@ class KeyPairDetailTab : public QWidget {
QGroupBox* additionalUidBox; /** Groupbox containing information about
additional uids */
- QLabel* nameVarLabel; /** Label containng the keys name */
- QLabel* emailVarLabel; /** Label containng the keys email */
- QLabel* commentVarLabel; /** Label containng the keys commment */
- QLabel* keySizeVarLabel; /** Label containng the keys keysize */
- QLabel* expireVarLabel; /** Label containng the keys expiration date */
- QLabel* createdVarLabel; /** Label containng the keys creation date */
+ QLabel* nameVarLabel; /** Label containng the keys name */
+ QLabel* emailVarLabel; /** Label containng the keys email */
+ QLabel* commentVarLabel; /** Label containng the keys commment */
+ QLabel* keySizeVarLabel; /** Label containng the keys keysize */
+ QLabel* expireVarLabel; /** Label containng the keys expiration date */
+ QLabel* createdVarLabel; /** Label containng the keys creation date */
+ QLabel* lastUpdateVarLabel;
QLabel* algorithmVarLabel; /** Label containng the keys algorithm */
QLabel* keyidVarLabel; /** Label containng the keys keyid */
QLabel* fingerPrintVarLabel; /** Label containng the keys fingerprint */
diff --git a/src/ui/keypair_details/KeyPairSubkeyTab.cpp b/src/ui/keypair_details/KeyPairSubkeyTab.cpp
index 4458be50..93e07875 100644
--- a/src/ui/keypair_details/KeyPairSubkeyTab.cpp
+++ b/src/ui/keypair_details/KeyPairSubkeyTab.cpp
@@ -34,8 +34,8 @@ KeyPairSubkeyTab::KeyPairSubkeyTab(const std::string& key_id, QWidget* parent)
createSubkeyList();
createSubkeyOperaMenu();
- listBox = new QGroupBox("Subkey List");
- detailBox = new QGroupBox("Detail of Selected Subkey");
+ listBox = new QGroupBox(_("Subkey List"));
+ detailBox = new QGroupBox(_("Detail of Selected Subkey"));
auto uidButtonsLayout = new QGridLayout();
@@ -90,7 +90,7 @@ KeyPairSubkeyTab::KeyPairSubkeyTab(const std::string& key_id, QWidget* parent)
subkeyDetailLayout->addWidget(fingerPrintVarLabel, 7, 1);
listBox->setLayout(subkeyListLayout);
- listBox->setContentsMargins(0, 5, 0, 0);
+ listBox->setContentsMargins(0, 12, 0, 0);
detailBox->setLayout(subkeyDetailLayout);
baseLayout->addWidget(listBox);
@@ -142,7 +142,7 @@ void KeyPairSubkeyTab::createSubkeyList() {
}
void KeyPairSubkeyTab::slotRefreshSubkeyList() {
- LOG(INFO) << "KeyPairSubkeyTab::slotRefreshSubkeyList Called";
+ LOG(INFO) << "Called";
int row = 0;
subkeyList->setSelectionMode(QAbstractItemView::SingleSelection);
@@ -212,11 +212,11 @@ void KeyPairSubkeyTab::slotRefreshSubkeyDetail() {
boost::posix_time::to_time_t(boost::posix_time::ptime(subkey.expires()));
expireVarLabel->setText(
- subkey_time_t == 0
- ? _("Never Expires")
- : QString::fromStdString(to_iso_string(subkey.expires())));
+ subkey_time_t == 0 ? _("Never Expires")
+ : QLocale::system().toString(QDateTime::fromTime_t(
+ to_time_t(subkey.expires()))));
if (subkey_time_t != 0 &&
- subkey.expires() < boost::posix_time::second_clock::local_time().date()) {
+ subkey.expires() < boost::posix_time::second_clock::local_time()) {
auto paletteExpired = expireVarLabel->palette();
paletteExpired.setColor(expireVarLabel->foregroundRole(), Qt::red);
expireVarLabel->setPalette(paletteExpired);
@@ -227,18 +227,17 @@ void KeyPairSubkeyTab::slotRefreshSubkeyDetail() {
}
algorithmVarLabel->setText(QString::fromStdString(subkey.pubkey_algo()));
- createdVarLabel->setText(
- QString::fromStdString(to_iso_string(subkey.timestamp())));
+ createdVarLabel->setText(QLocale::system().toString(
+ QDateTime::fromTime_t(to_time_t(subkey.timestamp()))));
- QString usage;
- QTextStream usage_steam(&usage);
+ std::stringstream usage_steam;
- if (subkey.can_certify()) usage_steam << _("Cert") << " ";
- if (subkey.can_encrypt()) usage_steam << _("Encr") << " ";
+ if (subkey.can_certify()) usage_steam << _("Certificate") << " ";
+ if (subkey.can_encrypt()) usage_steam << _("Encrypt") << " ";
if (subkey.can_sign()) usage_steam << _("Sign") << " ";
if (subkey.can_authenticate()) usage_steam << _("Auth") << " ";
- usageVarLabel->setText(usage);
+ usageVarLabel->setText(usage_steam.str().c_str());
// Show the situation that master key not exists.
masterKeyExistVarLabel->setText(subkey.secret() ? _("Exists")
@@ -268,8 +267,7 @@ void KeyPairSubkeyTab::createSubkeyOperaMenu() {
}
void KeyPairSubkeyTab::slotEditSubkey() {
- LOG(INFO) << "KeyPairSubkeyTab::slotEditSubkey Fpr"
- << getSelectedSubkey().fpr();
+ LOG(INFO) << "Fpr" << getSelectedSubkey().fpr();
auto dialog =
new KeySetExpireDateDialog(mKey.id(), getSelectedSubkey().fpr(), this);
diff --git a/src/ui/keypair_details/KeyPairSubkeyTab.h b/src/ui/keypair_details/KeyPairSubkeyTab.h
index 018f6ddc..8922e723 100644
--- a/src/ui/keypair_details/KeyPairSubkeyTab.h
+++ b/src/ui/keypair_details/KeyPairSubkeyTab.h
@@ -54,12 +54,12 @@ class KeyPairSubkeyTab : public QWidget {
QMenu* subkeyOperaMenu{};
- QLabel* keySizeVarLabel; /** Label containng the keys keysize */
- QLabel* expireVarLabel; /** Label containng the keys expiration date */
- QLabel* createdVarLabel; /** Label containng the keys creation date */
- QLabel* algorithmVarLabel; /** Label containng the keys algorithm */
- QLabel* keyidVarLabel; /** Label containng the keys keyid */
- QLabel* fingerPrintVarLabel; /** Label containng the keys fingerprint */
+ QLabel* keySizeVarLabel; /** Label containing the keys key size */
+ QLabel* expireVarLabel; /** Label containing the keys expiration date */
+ QLabel* createdVarLabel; /** Label containing the keys creation date */
+ QLabel* algorithmVarLabel; /** Label containing the keys algorithm */
+ QLabel* keyidVarLabel; /** Label containing the keys keyid */
+ QLabel* fingerPrintVarLabel; /** Label containing the keys fingerprint */
QLabel* usageVarLabel;
QLabel* masterKeyExistVarLabel;
diff --git a/src/ui/keypair_details/KeyPairUIDTab.cpp b/src/ui/keypair_details/KeyPairUIDTab.cpp
index 11055df3..8a58b270 100644
--- a/src/ui/keypair_details/KeyPairUIDTab.cpp
+++ b/src/ui/keypair_details/KeyPairUIDTab.cpp
@@ -24,6 +24,8 @@
#include "ui/keypair_details/KeyPairUIDTab.h"
+#include <boost/locale.hpp>
+
#include "gpg/function/GpgKeyGetter.h"
#include "gpg/function/GpgKeyManager.h"
#include "gpg/function/UidOperator.h"
@@ -271,16 +273,19 @@ void KeyPairUIDTab::slotRefreshSigList() {
sigList->setItem(sigRow, 2, tmp3);
}
- auto* tmp4 = new QTableWidgetItem(QString::fromStdString(
- boost::gregorian::to_iso_string(sig.create_time())));
+ std::stringstream ss;
+ ss << boost::locale::as::datetime << sig.create_time();
+ auto* tmp4 = new QTableWidgetItem(ss.str().c_str());
sigList->setItem(sigRow, 3, tmp4);
+ ss.str(std::string());
+ ss << boost::locale::as::datetime << sig.expire_time();
+
auto* tmp5 = new QTableWidgetItem(
boost::posix_time::to_time_t(
boost::posix_time::ptime(sig.expire_time())) == 0
? _("Never Expires")
- : QString::fromStdString(
- boost::gregorian::to_iso_string(sig.expire_time())));
+ : ss.str().c_str());
tmp5->setTextAlignment(Qt::AlignCenter);
sigList->setItem(sigRow, 4, tmp5);
diff --git a/src/ui/keypair_details/KeySetExpireDateDialog.cpp b/src/ui/keypair_details/KeySetExpireDateDialog.cpp
index d197a76b..a90a4e4b 100644
--- a/src/ui/keypair_details/KeySetExpireDateDialog.cpp
+++ b/src/ui/keypair_details/KeySetExpireDateDialog.cpp
@@ -48,19 +48,16 @@ KeySetExpireDateDialog::KeySetExpireDateDialog(const KeyId& key_id,
}
void KeySetExpireDateDialog::slotConfirm() {
- LOG(INFO) << "KeySetExpireDateDialog::slotConfirm Called";
-
- std::unique_ptr<boost::gregorian::date> expires = nullptr;
+ LOG(INFO) << "Called"
+ << this->dateTimeEdit->dateTime().toLocalTime().toTime_t();
+ std::unique_ptr<boost::posix_time::ptime> expires = nullptr;
if (this->nonExpiredCheck->checkState() == Qt::Unchecked) {
- expires = std::make_unique<boost::gregorian::date>(
+ expires = std::make_unique<boost::posix_time::ptime>(
boost::posix_time::from_time_t(
- this->dateTimeEdit->dateTime().toTime_t())
- .date());
- LOG(INFO) << "KeySetExpireDateDialog::slotConfirm" << mKey.id() << mSubkey
- << *expires;
+ this->dateTimeEdit->dateTime().toLocalTime().toTime_t()));
+ LOG(INFO) << "keyid" << mKey.id() << mSubkey << *expires;
} else {
- LOG(INFO) << "KeySetExpireDateDialog::slotConfirm" << mKey.id() << mSubkey
- << "Non Expired";
+ LOG(INFO) << "keyid" << mKey.id() << mSubkey << "Non Expired";
}
auto err = GpgKeyOpera::GetInstance().SetExpire(mKey, mSubkey, expires);
@@ -84,10 +81,15 @@ void KeySetExpireDateDialog::slotConfirm() {
}
void KeySetExpireDateDialog::init() {
- QDateTime maxDateTime = QDateTime::currentDateTime().addYears(2);
+ QDateTime maxDateTime =
+ QDateTime::currentDateTime().toLocalTime().addYears(2);
dateTimeEdit = new QDateTimeEdit(maxDateTime);
+ dateTimeEdit->setTimeSpec(Qt::TimeSpec::TimeZone);
+ LOG(INFO) << "timespec" << Qt::TimeSpec::TimeZone;
+ dateTimeEdit->setCalendarPopup(true);
dateTimeEdit->setMinimumDateTime(QDateTime::currentDateTime().addSecs(1));
dateTimeEdit->setMaximumDateTime(maxDateTime);
+
nonExpiredCheck = new QCheckBox();
nonExpiredCheck->setTristate(false);
confirmButton = new QPushButton(_("Confirm"));
@@ -103,7 +105,7 @@ void KeySetExpireDateDialog::init() {
connect(confirmButton, SIGNAL(clicked(bool)), this, SLOT(slotConfirm()));
this->setLayout(gridLayout);
- this->setWindowTitle("Edit Expire Datetime");
+ this->setWindowTitle(_("Edit Expire Datetime"));
this->setModal(true);
this->setAttribute(Qt::WA_DeleteOnClose, true);
diff --git a/src/ui/keypair_details/KeyUIDSignDialog.cpp b/src/ui/keypair_details/KeyUIDSignDialog.cpp
index 78e4900c..d9592c56 100644
--- a/src/ui/keypair_details/KeyUIDSignDialog.cpp
+++ b/src/ui/keypair_details/KeyUIDSignDialog.cpp
@@ -97,20 +97,19 @@ KeyUIDSignDialog::KeyUIDSignDialog(const GpgKey& key, UIDArgsListPtr uid,
}
void KeyUIDSignDialog::slotSignKey(bool clicked) {
- LOG(INFO) << "KeyUIDSignDialog::slotSignKey Called";
+ LOG(INFO) << "Called";
// Set Signers
auto key_ids = mKeyList->getChecked();
auto keys = GpgKeyGetter::GetInstance().GetKeys(key_ids);
- LOG(INFO) << "KeyUIDSignDialog::slotSignKey Key Info Got";
- auto expires = std::make_unique<boost::gregorian::date>(
- boost::posix_time::from_time_t(expiresEdit->dateTime().toTime_t())
- .date());
+ LOG(INFO) << "Key Info Got";
+ auto expires = std::make_unique<boost::posix_time::ptime>(
+ boost::posix_time::from_time_t(expiresEdit->dateTime().toTime_t()));
- LOG(INFO) << "KeyUIDSignDialog::slotSignKey Sign Start";
+ LOG(INFO) << "Sign Start";
for (const auto& uid : *mUids) {
- LOG(INFO) << "KeyUIDSignDialog::slotSignKey Sign UID" << uid;
+ LOG(INFO) << "Sign UID" << uid;
// Sign For mKey
if (!GpgKeyManager::GetInstance().signKey(mKey, *keys, uid, expires)) {
QMessageBox::critical(
diff --git a/src/ui/main_window/MainWindowSlotFunction.cpp b/src/ui/main_window/MainWindowSlotFunction.cpp
index f328c45a..f2b98be1 100644
--- a/src/ui/main_window/MainWindowSlotFunction.cpp
+++ b/src/ui/main_window/MainWindowSlotFunction.cpp
@@ -490,7 +490,7 @@ void MainWindow::refreshKeysFromKeyserver() {
auto key_ids = mKeyList->getSelected();
if (key_ids->empty()) return;
- auto* dialog = new KeyServerImportDialog(true, this);
+ auto* dialog = new KeyServerImportDialog(this);
dialog->show();
dialog->slotImport(key_ids);
}
diff --git a/src/ui/main_window/MainWindowSlotUI.cpp b/src/ui/main_window/MainWindowSlotUI.cpp
index 9a7c7b83..0c0204f4 100644
--- a/src/ui/main_window/MainWindowSlotUI.cpp
+++ b/src/ui/main_window/MainWindowSlotUI.cpp
@@ -28,10 +28,6 @@
namespace GpgFrontend::UI {
-void MainWindow::slotAbout() { new AboutDialog(0, this); }
-
-void MainWindow::slotCheckUpdate() { new AboutDialog(2, this); }
-
void MainWindow::slotSetStatusBarText(const QString& text) {
statusBar()->showMessage(text, 20000);
}
diff --git a/src/ui/main_window/MainWindowUI.cpp b/src/ui/main_window/MainWindowUI.cpp
index 7ceaffa2..4499b9c8 100644
--- a/src/ui/main_window/MainWindowUI.cpp
+++ b/src/ui/main_window/MainWindowUI.cpp
@@ -254,7 +254,14 @@ void MainWindow::createActions() {
aboutAct = new QAction(_("About"), this);
aboutAct->setIcon(QIcon(":help.png"));
aboutAct->setToolTip(_("Show the application's About box"));
- connect(aboutAct, SIGNAL(triggered()), this, SLOT(slotAbout()));
+ connect(aboutAct, &QAction::triggered, this,
+ [=]() { new AboutDialog(0, this); });
+
+ translateAct = new QAction(_("Translate"), this);
+ translateAct->setIcon(QIcon(":help.png"));
+ translateAct->setToolTip(_("Information about translation"));
+ connect(translateAct, &QAction::triggered, this,
+ [=]() { new AboutDialog(1, this); });
/*
* Check Update Menu
@@ -262,7 +269,8 @@ void MainWindow::createActions() {
checkUpdateAct = new QAction(_("Check for Updates"), this);
checkUpdateAct->setIcon(QIcon(":help.png"));
checkUpdateAct->setToolTip(_("Check for updates"));
- connect(checkUpdateAct, SIGNAL(triggered()), this, SLOT(slotCheckUpdate()));
+ connect(checkUpdateAct, &QAction::triggered, this,
+ [=]() { new AboutDialog(2, this); });
startWizardAct = new QAction(_("Open Wizard"), this);
startWizardAct->setToolTip(_("Open the wizard"));
@@ -398,6 +406,7 @@ void MainWindow::createMenus() {
helpMenu->addAction(startWizardAct);
helpMenu->addSeparator();
helpMenu->addAction(checkUpdateAct);
+ helpMenu->addAction(translateAct);
helpMenu->addAction(aboutAct);
}
@@ -410,7 +419,7 @@ void MainWindow::createToolBars() {
fileToolBar->addAction(browserAct);
viewMenu->addAction(fileToolBar->toggleViewAction());
- cryptToolBar = addToolBar(_("Crypt"));
+ cryptToolBar = addToolBar(_("Operations"));
cryptToolBar->setObjectName("cryptToolBar");
cryptToolBar->addAction(encryptAct);
cryptToolBar->addAction(encryptSignAct);
diff --git a/src/ui/settings/GlobalSettingStation.h b/src/ui/settings/GlobalSettingStation.h
index ef2c6a9a..07b904a8 100644
--- a/src/ui/settings/GlobalSettingStation.h
+++ b/src/ui/settings/GlobalSettingStation.h
@@ -51,6 +51,10 @@ class GlobalSettingStation : public QObject {
return app_locale_path;
}
+ [[nodiscard]] boost::filesystem::path GetResourceDir() const {
+ return app_resource_path;
+ }
+
void Sync() noexcept;
private:
@@ -66,8 +70,10 @@ class GlobalSettingStation : public QObject {
boost::filesystem::path app_log_path = app_data_path / "logs";
// Program Data Location
- boost::filesystem::path app_locale_path =
- RESOURCE_DIR_BOOST_PATH(app_path) / "locales";
+ boost::filesystem::path app_resource_path = RESOURCE_DIR_BOOST_PATH(app_path);
+
+ // Program Data Location
+ boost::filesystem::path app_locale_path = app_resource_path / "locales";
// Program Configure Location
boost::filesystem::path app_configure_path =
diff --git a/src/ui/widgets/FilePage.cpp b/src/ui/widgets/FilePage.cpp
index 073ccf6b..d031114a 100644
--- a/src/ui/widgets/FilePage.cpp
+++ b/src/ui/widgets/FilePage.cpp
@@ -79,6 +79,13 @@ FilePage::FilePage(QWidget* parent) : QWidget(parent) {
pathEdit = new QLineEdit();
pathEdit->setText(dirModel->rootPath());
+ pathEditCompleter = new QCompleter(this);
+ pathCompleteModel = new QStringListModel();
+ pathEditCompleter->setModel(pathCompleteModel);
+ pathEditCompleter->setCaseSensitivity(Qt::CaseInsensitive);
+ pathEditCompleter->setCompletionMode(QCompleter::UnfilteredPopupCompletion);
+ pathEdit->setCompleter(pathEditCompleter);
+
auto* menuLayout = new QHBoxLayout();
menuLayout->addWidget(upLevelButton);
menuLayout->setStretchFactor(upLevelButton, 1);
@@ -104,6 +111,17 @@ FilePage::FilePage(QWidget* parent) : QWidget(parent) {
connect(dirTreeView, &QTreeView::customContextMenuRequested, this,
&FilePage::onCustomContextMenu);
+ connect(pathEdit, &QLineEdit::textChanged, [=]() {
+ auto dir = QDir(pathEdit->text());
+ if (dir.isReadable()) {
+ auto dir_list = dir.entryInfoList(QDir::AllEntries);
+ QStringList paths;
+ for (int i = 1; i < dir_list.size(); i++)
+ paths.append(dir_list.at(i).filePath());
+ pathCompleteModel->setStringList(paths);
+ }
+ });
+
connect(this, &FilePage::signalRefreshInfoBoard, SignalStation::GetInstance(),
&SignalStation::signalRefreshInfoBoard);
}
@@ -151,9 +169,11 @@ void FilePage::slotGoPath() {
dirTreeView->resizeColumnToContents(i);
}
pathEdit->setText(mPath.generic_path().string().c_str());
+
} else {
- QMessageBox::critical(this, _("Error"),
- _("The path is unprivileged or unreachable."));
+ QMessageBox::critical(
+ this, _("Error"),
+ _("The path is not exists, unprivileged or unreachable."));
}
emit pathChanged(mPath.string().c_str());
}
@@ -178,8 +198,9 @@ void FilePage::createPopupMenu() {
new QAction(QString(_("Verify")) + " " + _("(.sig .gpg .asc)"), this);
connect(verifyItemAct, SIGNAL(triggered()), this, SLOT(slotVerifyItem()));
- auto hashItemAct = new QAction(_("Calculate Hash"), this);
- connect(hashItemAct, SIGNAL(triggered()), this, SLOT(slotCalculateHash()));
+ hashCalculateAct = new QAction(_("Calculate Hash"), this);
+ connect(hashCalculateAct, SIGNAL(triggered()), this,
+ SLOT(slotCalculateHash()));
popUpMenu->addAction(openItemAct);
popUpMenu->addAction(renameItemAct);
@@ -190,7 +211,7 @@ void FilePage::createPopupMenu() {
popUpMenu->addAction(signItemAct);
popUpMenu->addAction(verifyItemAct);
popUpMenu->addSeparator();
- popUpMenu->addAction(hashItemAct);
+ popUpMenu->addAction(hashCalculateAct);
}
void FilePage::onCustomContextMenu(const QPoint& point) {
@@ -209,6 +230,7 @@ void FilePage::onCustomContextMenu(const QPoint& point) {
(info.suffix() != "gpg" && info.suffix() != "sig"));
verifyItemAct->setEnabled(
info.isFile() && (info.suffix() == "sig" || info.suffix() == "gpg"));
+ hashCalculateAct->setEnabled(info.isFile() && info.isReadable());
popUpMenu->exec(dirTreeView->viewport()->mapToGlobal(point));
}
@@ -308,7 +330,7 @@ void FilePage::slotCalculateHash() {
if (info.isFile() && info.isReadable()) {
std::stringstream ss;
- ss << "[#] " << _("File Hash") << std::endl;
+ ss << "[#] " << _("File Hash Information") << std::endl;
ss << " " << _("filename") << _(": ")
<< selectedPath.filename().string().c_str() << std::endl;
@@ -323,21 +345,24 @@ void FilePage::slotCalculateHash() {
hash_md5.addData(buffer);
auto md5 = hash_md5.result().toHex().toStdString();
LOG(INFO) << "md5" << md5;
- ss << " " << _("md5") << _(": ") << md5 << std::endl;
+ ss << " "
+ << "md5" << _(": ") << md5 << std::endl;
auto hash_sha1 = QCryptographicHash(QCryptographicHash::Sha1);
// sha1
hash_sha1.addData(buffer);
auto sha1 = hash_sha1.result().toHex().toStdString();
LOG(INFO) << "sha1" << sha1;
- ss << " " << _("sha1") << _(": ") << sha1 << std::endl;
+ ss << " "
+ << "sha1" << _(": ") << sha1 << std::endl;
auto hash_sha256 = QCryptographicHash(QCryptographicHash::Sha256);
// sha1
hash_sha256.addData(buffer);
auto sha256 = hash_sha256.result().toHex().toStdString();
LOG(INFO) << "sha256" << sha256;
- ss << " " << _("sha256") << _(": ") << sha256 << std::endl;
+ ss << " "
+ << "sha256" << _(": ") << sha256 << std::endl;
ss << std::endl;
diff --git a/src/ui/widgets/FilePage.h b/src/ui/widgets/FilePage.h
index 8533aaac..2a9f5b57 100644
--- a/src/ui/widgets/FilePage.h
+++ b/src/ui/widgets/FilePage.h
@@ -54,7 +54,7 @@ class FilePage : public QWidget {
void fileTreeViewItemDoubleClicked(const QModelIndex& index);
void slotUpLevel();
-
+
void slotOpenItem();
void slotRenameItem();
void slotDeleteItem();
@@ -75,6 +75,8 @@ class FilePage : public QWidget {
QFileSystemModel* dirModel;
QTreeView* dirTreeView;
QLineEdit* pathEdit;
+ QCompleter* pathEditCompleter;
+ QStringListModel* pathCompleteModel;
// using boost path
boost::filesystem::path mPath;
@@ -89,7 +91,7 @@ class FilePage : public QWidget {
QAction* decryptItemAct{};
QAction* signItemAct{};
QAction* verifyItemAct{};
-
+ QAction* hashCalculateAct{};
QWidget* firstParent;
};
diff --git a/src/ui/widgets/InfoBoardWidget.cpp b/src/ui/widgets/InfoBoardWidget.cpp
index 2409edd7..7b7ea38e 100644
--- a/src/ui/widgets/InfoBoardWidget.cpp
+++ b/src/ui/widgets/InfoBoardWidget.cpp
@@ -55,7 +55,7 @@ InfoBoardWidget::InfoBoardWidget(QWidget* parent, KeyList* keyList)
actionButtonLayout->setContentsMargins(0, 0, 0, 0);
actionButtonLayout->setSpacing(0);
- auto* label = new QLabel(_("Board Actions"));
+ auto* label = new QLabel(_("Actions"));
label->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
label->setContentsMargins(0, 0, 0, 0);
mButtonGroup = new QButtonGroup(this);
diff --git a/src/ui/widgets/VerifyKeyDetailBox.cpp b/src/ui/widgets/VerifyKeyDetailBox.cpp
index 3975ac93..3187e156 100644
--- a/src/ui/widgets/VerifyKeyDetailBox.cpp
+++ b/src/ui/widgets/VerifyKeyDetailBox.cpp
@@ -181,32 +181,31 @@ QGridLayout* VerifyKeyDetailBox::createKeyInfoGrid(
grid->addWidget(new QLabel(_("NOT Fully Valid")), 3, 1);
}
- QString flags;
- QTextStream textStream(&flags);
+ std::stringstream text_stream;
if (signature.summary() & GPGME_SIGSUM_GREEN) {
- textStream << _("Good") << " ";
+ text_stream << _("Good") << " ";
}
if (signature.summary() & GPGME_SIGSUM_RED) {
- textStream << _("Bad") << " ";
+ text_stream << _("Bad") << " ";
}
if (signature.summary() & GPGME_SIGSUM_SIG_EXPIRED) {
- textStream << _("Expired") << " ";
+ text_stream << _("Expired") << " ";
}
if (signature.summary() & GPGME_SIGSUM_KEY_MISSING) {
- textStream << _("Missing Key") << " ";
+ text_stream << _("Missing Key") << " ";
}
if (signature.summary() & GPGME_SIGSUM_KEY_REVOKED) {
- textStream << _("Revoked Key") << " ";
+ text_stream << _("Revoked Key") << " ";
}
if (signature.summary() & GPGME_SIGSUM_KEY_EXPIRED) {
- textStream << _("Expired Key") << " ";
+ text_stream << _("Expired Key") << " ";
}
if (signature.summary() & GPGME_SIGSUM_CRL_MISSING) {
- textStream << _("Missing CRL") << " ";
+ text_stream << _("Missing CRL") << " ";
}
- grid->addWidget(new QLabel(flags.toStdString().c_str()), 4, 1);
+ grid->addWidget(new QLabel(text_stream.str().c_str()), 4, 1);
return grid;
}