fix: slove discovered bugs

src/core/function/GlobalSettingStation.cpp

@@ -31,18 +31,6 @@
 #include "core/module/ModuleManager.h"
 #include "core/utils/FilesystemUtils.h"
 
-// macros to find resource files
-#if defined(MACOS) && defined(RELEASE)
-#define RESOURCE_DIR(appDir) (appDir + "/../Resources/")
-#define RESOURCE_DIR_PATH(appDir) (appDir / ".." / "Resources")
-#elif defined(LINUX) && defined(RELEASE)
-#define RESOURCE_DIR(appDir) (appDir + "/../share/")
-#define RESOURCE_DIR_PATH(appDir) (appDir / ".." / "share")
-#else
-#define RESOURCE_DIR(appDir) (appDir)
-#define RESOURCE_DIR_PATH(appDir) (appDir)
-#endif
-
 namespace GpgFrontend {
 
 class GlobalSettingStation::Impl {

src/core/function/result_analyse/GpgVerifyResultAnalyse.cpp

@@ -56,11 +56,11 @@ void GpgFrontend::GpgVerifyResultAnalyse::doAnalyse() {
     auto *sign = result->signatures;
 
     stream_ << "-> " << tr("Signed On") << "(" << tr("UTC") << ")"
-            << " " << QDateTime::fromSecsSinceEpoch(sign->timestamp).toString()
+            << ": " << QDateTime::fromSecsSinceEpoch(sign->timestamp).toString()
             << Qt::endl;
 
     stream_ << "-> " << tr("Signed On") << "(" << tr("Localized") << ")"
-            << " " << GetFormatedDateByTimestamp(sign->timestamp) << Qt::endl;
+            << ": " << GetFormatedDateByTimestamp(sign->timestamp) << Qt::endl;
 
     stream_ << Qt::endl << "## " << tr("Signatures List") << ":" << Qt::endl;
     stream_ << Qt::endl;

src/core/utils/LocalizedUtils.cpp

@@ -33,6 +33,6 @@
 namespace GpgFrontend {
 
 auto GetFormatedDateByTimestamp(time_t timestamp) -> QString {
-  return QLocale::system().toString(QDateTime::fromSecsSinceEpoch(timestamp));
+  return QLocale().toString(QDateTime::fromSecsSinceEpoch(timestamp));
 }
 }  // namespace GpgFrontend

src/ui/GpgFrontendUIInit.cpp

@@ -211,10 +211,12 @@ void InitLocale() {
 
   // read from settings file
   auto lang = settings.value("basic/lang").toString();
-  GF_UI_LOG_INFO("current system locale: {}", QLocale().name());
-  GF_UI_LOG_INFO("current custom locale settings: {}", lang);
+  GF_UI_LOG_INFO("current system default locale: {}", QLocale().name());
 
   auto target_locale = lang.isEmpty() ? QLocale() : QLocale(lang);
+  QLocale::setDefault(target_locale);
+  GF_UI_LOG_INFO("target locale settings: {}", target_locale.name());
+
   auto* translator = new QTranslator(QCoreApplication::instance());
   if (translator->load(target_locale, QLatin1String(PROJECT_NAME),
                        QLatin1String("."), QLatin1String(":/i18n"),

src/ui/UserInterfaceUtils.cpp

@@ -273,7 +273,7 @@ void CommonUtils::SlotImportKeys(QWidget *parent, const QString &in_buffer) {
       GpgKeyImportExporter::GetInstance().ImportKey(GFBuffer(in_buffer));
   emit SignalKeyStatusUpdated();
 
-  (new KeyImportDetailDialog(info, parent))->exec();
+  (new KeyImportDetailDialog(info, parent));
 }
 
 void CommonUtils::SlotImportKeyFromFile(QWidget *parent) {

src/ui/dialog/details/VerifyDetailsDialog.cpp

@@ -71,13 +71,12 @@ void VerifyDetailsDialog::slot_refresh() {
     m_vbox_layout->addWidget(new QLabel(tr("Error Validating signature")));
   } else if (input_signature_ != nullptr) {
     const auto info =
-        tr("File was signed on %1").arg(QLocale::system().toString(timestamp)) +
+        tr("File was signed on %1").arg(QLocale().toString(timestamp)) +
         "<br/>" + tr("It Contains") + ": " + "<br/><br/>";
     m_vbox_layout->addWidget(new QLabel(info));
   } else {
-    const auto info =
-        tr("Signed on %1").arg(QLocale::system().toString(timestamp)) +
-        "<br/>" + tr("It Contains") + ": " + "<br/><br/>";
+    const auto info = tr("Signed on %1").arg(QLocale().toString(timestamp)) +
+                      "<br/>" + tr("It Contains") + ": " + "<br/><br/>";
     m_vbox_layout->addWidget(new QLabel(info));
   }
   // Add information box for every single key

src/ui/dialog/import_export/KeyImportDetailDialog.cpp

@@ -37,34 +37,35 @@ KeyImportDetailDialog::KeyImportDetailDialog(
     std::shared_ptr<GpgImportInformation> result, QWidget* parent)
     : GeneralDialog(typeid(KeyImportDetailDialog).name(), parent),
       m_result_(std::move(result)) {
+  this->setAttribute(Qt::WA_DeleteOnClose);
+
   // If no key for import found, just show a message
-  if (m_result_->considered == 0) {
+  if (m_result_ == nullptr || m_result_->considered == 0) {
     QMessageBox::information(parent, tr("Key Import Details"),
                              tr("No keys found to import"));
-    emit finished(0);
+
     this->close();
-    this->deleteLater();
-  } else {
-    auto* mv_box = new QVBoxLayout();
+    return;
+  }
 
-    this->create_general_info_box();
-    mv_box->addWidget(general_info_box_);
-    this->create_keys_table();
-    mv_box->addWidget(keys_table_);
-    this->create_button_box();
-    mv_box->addWidget(button_box_);
+  auto* mv_box = new QVBoxLayout();
 
-    this->setLayout(mv_box);
-    this->setWindowTitle(tr("Key Import Details"));
+  this->create_general_info_box();
+  mv_box->addWidget(general_info_box_);
+  this->create_keys_table();
+  mv_box->addWidget(keys_table_);
+  this->create_button_box();
+  mv_box->addWidget(button_box_);
 
-    this->setMinimumSize(QSize(600, 300));
-    this->adjustSize();
+  this->setLayout(mv_box);
+  this->setWindowTitle(tr("Key Import Details"));
 
-    movePosition2CenterOfParent();
+  this->setMinimumSize(QSize(600, 300));
+  this->adjustSize();
 
-    this->setModal(true);
-    this->show();
-  }
+  movePosition2CenterOfParent();
+  this->setModal(true);
+  this->show();
 }
 
 void KeyImportDetailDialog::create_general_info_box() {

src/ui/dialog/keypair_details/KeyPairDetailTab.cpp

@@ -49,8 +49,8 @@ KeyPairDetailTab::KeyPairDetailTab(const QString& key_id, QWidget* parent)
 
   comment_var_label_ = new QLabel();
   comment_var_label_->setTextInteractionFlags(Qt::TextSelectableByMouse);
-  key_id_var_label = new QLabel();
-  key_id_var_label->setTextInteractionFlags(Qt::TextSelectableByMouse);
+  key_id_var_label_ = new QLabel();
+  key_id_var_label_->setTextInteractionFlags(Qt::TextSelectableByMouse);
 
   usage_var_label_ = new QLabel();
   actual_usage_var_label_ = new QLabel();
@@ -87,8 +87,8 @@ KeyPairDetailTab::KeyPairDetailTab(const QString& key_id, QWidget* parent)
   vbox_kd->addWidget(new QLabel(tr("Last Update (Local Time)") + ": "), 9, 0);
   vbox_kd->addWidget(new QLabel(tr("Primary Key Existence") + ": "), 10, 0);
 
-  key_id_var_label->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
-  vbox_kd->addWidget(key_id_var_label, 0, 1, 1, 1);
+  key_id_var_label_->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+  vbox_kd->addWidget(key_id_var_label_, 0, 1, 1, 1);
   vbox_kd->addWidget(algorithm_var_label_, 1, 1, 1, 2);
   vbox_kd->addWidget(algorithm_detail_var_label_, 2, 1, 1, 2);
   vbox_kd->addWidget(key_size_var_label_, 3, 1, 1, 2);
@@ -105,7 +105,7 @@ KeyPairDetailTab::KeyPairDetailTab(const QString& key_id, QWidget* parent)
   copy_key_id_button->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
   vbox_kd->addWidget(copy_key_id_button, 0, 2);
   connect(copy_key_id_button, &QPushButton::clicked, this, [=]() {
-    QString fpr = key_id_var_label->text().trimmed();
+    QString fpr = key_id_var_label_->text().trimmed();
     QClipboard* cb = QApplication::clipboard();
     cb->setText(fpr);
   });
@@ -138,19 +138,19 @@ KeyPairDetailTab::KeyPairDetailTab(const QString& key_id, QWidget* parent)
   mvbox->addWidget(fingerprint_box_);
   mvbox->addStretch();
 
-  auto* expBox = new QHBoxLayout();
+  auto* exp_box = new QHBoxLayout();
   QPixmap pixmap(":/icons/warning.png");
 
   exp_label_ = new QLabel();
   icon_label_ = new QLabel();
 
   icon_label_->setPixmap(pixmap.scaled(24, 24, Qt::KeepAspectRatio));
   exp_label_->setAlignment(Qt::AlignCenter);
-  expBox->addStretch();
-  expBox->addWidget(icon_label_);
-  expBox->addWidget(exp_label_);
-  expBox->addStretch();
-  mvbox->addLayout(expBox);
+  exp_box->addStretch();
+  exp_box->addWidget(icon_label_);
+  exp_box->addWidget(exp_label_);
+  exp_box->addStretch();
+  mvbox->addLayout(exp_box);
   mvbox->setContentsMargins(0, 0, 0, 0);
 
   // when key database updated
@@ -200,7 +200,7 @@ void KeyPairDetailTab::slot_refresh_key_info() {
   email_var_label_->setText(key_.GetEmail());
 
   comment_var_label_->setText(key_.GetComment());
-  key_id_var_label->setText(key_.GetId());
+  key_id_var_label_->setText(key_.GetId());
 
   QString buffer;
   QTextStream usage_steam(&buffer);
@@ -245,20 +245,19 @@ void KeyPairDetailTab::slot_refresh_key_info() {
   if (key_.GetExpireTime().toSecsSinceEpoch() == 0) {
     expire_var_label_->setText(tr("Never Expire"));
   } else {
-    expire_var_label_->setText(
-        QLocale::system().toString((key_.GetExpireTime())));
+    expire_var_label_->setText(QLocale().toString((key_.GetExpireTime())));
   }
 
   key_algo_val = key_.GetPublicKeyAlgo();
   key_algo_detail_val = key_.GetKeyAlgo();
 
-  created_var_label_->setText(QLocale::system().toString(key_.GetCreateTime()));
+  created_var_label_->setText(QLocale().toString(key_.GetCreateTime()));
 
   if (key_.GetLastUpdateTime().toSecsSinceEpoch() == 0) {
     last_update_var_label_->setText(tr("No Data"));
   } else {
     last_update_var_label_->setText(
-        QLocale::system().toString(key_.GetLastUpdateTime()));
+        QLocale().toString(key_.GetLastUpdateTime()));
   }
 
   key_size_var_label_->setText(key_size_val);

src/ui/dialog/keypair_details/KeyPairDetailTab.h

@@ -77,7 +77,7 @@ class KeyPairDetailTab : public QWidget {
   QLabel* algorithm_var_label_;    ///< Label containing the keys algorithm
   QLabel*
       algorithm_detail_var_label_;  ///< containing the keys algorithm detail
-  QLabel* key_id_var_label;         ///< Label containing the keys keyid
+  QLabel* key_id_var_label_;        ///< Label containing the keys keyid
   QLabel* fingerprint_var_label_;   ///< Label containing the keys fingerprint
   QLabel* usage_var_label_;
   QLabel* actual_usage_var_label_;

src/ui/dialog/keypair_details/KeyPairOperaTab.cpp

@@ -104,6 +104,8 @@ KeyPairOperaTab::KeyPairOperaTab(const QString& key_id, QWidget* parent)
   }
 
   auto* modify_tofu_button = new QPushButton(tr("Modify TOFU Policy"));
+  // do not show, useless
+  modify_tofu_button->setHidden(true);
   connect(modify_tofu_button, &QPushButton::clicked, this,
           &KeyPairOperaTab::slot_modify_tofu_policy);
 

src/ui/dialog/keypair_details/KeyPairSubkeyTab.cpp

@@ -235,9 +235,9 @@ void KeyPairSubkeyTab::slot_refresh_subkey_detail() {
 
   time_t subkey_time_t = subkey.GetExpireTime().toSecsSinceEpoch();
 
-  expire_var_label_->setText(
-      subkey_time_t == 0 ? tr("Never Expires")
-                         : QLocale::system().toString(subkey.GetExpireTime()));
+  expire_var_label_->setText(subkey_time_t == 0
+                                 ? tr("Never Expires")
+                                 : QLocale().toString(subkey.GetExpireTime()));
 
   if (subkey_time_t != 0 &&
       subkey.GetExpireTime() < QDateTime::currentDateTime()) {
@@ -252,8 +252,7 @@ void KeyPairSubkeyTab::slot_refresh_subkey_detail() {
 
   algorithm_var_label_->setText(subkey.GetPubkeyAlgo());
   algorithm_detail_var_label_->setText(subkey.GetKeyAlgo());
-  created_var_label_->setText(
-      QLocale::system().toString(subkey.GetCreateTime()));
+  created_var_label_->setText(QLocale().toString(subkey.GetCreateTime()));
 
   QString buffer;
   QTextStream usage_steam(&buffer);

src/ui/dialog/keypair_details/KeyPairUIDTab.cpp

@@ -280,13 +280,13 @@ void KeyPairUIDTab::slot_refresh_sig_list() {
         sig_list_->setItem(sig_row, 2, tmp3);
       }
       auto* tmp4 =
-          new QTableWidgetItem(QLocale::system().toString(sig.GetCreateTime()));
+          new QTableWidgetItem(QLocale().toString(sig.GetCreateTime()));
       sig_list_->setItem(sig_row, 3, tmp4);
 
-      auto* tmp5 = new QTableWidgetItem(
-          sig.GetExpireTime().toSecsSinceEpoch() == 0
-              ? tr("Never Expires")
-              : QLocale::system().toString(sig.GetExpireTime()));
+      auto* tmp5 =
+          new QTableWidgetItem(sig.GetExpireTime().toSecsSinceEpoch() == 0
+                                   ? tr("Never Expires")
+                                   : QLocale().toString(sig.GetExpireTime()));
       tmp5->setTextAlignment(Qt::AlignCenter);
       sig_list_->setItem(sig_row, 4, tmp5);
 

src/ui/main_window/MainWindowSlotFunction.cpp

@@ -98,8 +98,7 @@ void MainWindow::slot_append_keys_create_datetime() {
   }
 
   auto create_datetime_format_str_local =
-      QLocale::system().toString(key.GetCreateTime()) + tr(" (Local Time) ") +
-      "\n";
+      QLocale().toString(key.GetCreateTime()) + tr(" (Local Time) ") + "\n";
   edit_->SlotAppendText2CurTextPage(create_datetime_format_str_local);
 }
 

src/ui/widgets/HelpPage.cpp

@@ -64,10 +64,9 @@ QUrl HelpPage::localized_help(const QUrl& url) {
   QStringList fileparts = filename.split(".");
 
   // QSettings settings;
-  QString lang =
-      QSettings().value("int/lang", QLocale::system().name()).toString();
+  QString lang = QSettings().value("int/lang", QLocale().name()).toString();
   if (lang.isEmpty()) {
-    lang = QLocale::system().name();
+    lang = QLocale().name();
   }
 
   fileparts.insert(1, lang);

src/ui/widgets/KeyList.cpp

@@ -407,7 +407,7 @@ void KeyList::dragEnterEvent(QDragEnterEvent* event) {
 void KeyList::import_keys(const QByteArray& in_buffer) {
   auto result =
       GpgKeyImportExporter::GetInstance().ImportKey(GFBuffer(in_buffer));
-  (new KeyImportDetailDialog(result, this))->exec();
+  (new KeyImportDetailDialog(result, this));
 }
 
 void KeyList::slot_double_clicked(const QModelIndex& index) {