Merge pull request #148 from saturneric/develop

Develop 2.1.3.1

1 files changed, 11 insertions, 15 deletions

diff --git a/src/ui/main_window/MainWindowSlotFunction.cpp b/src/ui/main_window/MainWindowSlotFunction.cpp
index 6f0a99fb..7d50b85a 100644
--- a/src/ui/main_window/MainWindowSlotFunction.cpp
+++ b/src/ui/main_window/MainWindowSlotFunction.cpp
@@ -101,8 +101,9 @@ void MainWindow::slot_append_keys_create_datetime() {
   auto create_datetime_format_str_local =
       QLocale().toString(key.GetCreateTime()) + " (" + tr("Localize") + ") " +
       "\n";
-  auto create_datetime_format_str = key.GetCreateTime().toString(Qt::ISODate) +
-                                    " (" + tr("UTC") + ") " + "\n ";
+  auto create_datetime_format_str =
+      QLocale().toString(key.GetCreateTime().toUTC()) + " (" + tr("UTC") +
+      ") " + "\n ";
   edit_->SlotAppendText2CurTextPage(create_datetime_format_str_local +
                                     create_datetime_format_str);
 }
@@ -125,7 +126,7 @@ void MainWindow::slot_append_keys_expire_datetime() {
       QLocale().toString(key.GetCreateTime()) + " (" + tr("Local Time") + ") " +
       "\n";
   auto expire_datetime_format_str =
-      key.GetCreateTime().toString(Qt::ISODate) + " (UTC) " + "\n";
+      QLocale().toString(key.GetCreateTime().toUTC()) + " (UTC) " + "\n";
 
   edit_->SlotAppendText2CurTextPage(expire_datetime_format_str_local +
                                     expire_datetime_format_str);
@@ -261,12 +262,11 @@ void MainWindow::SlotOpenFile(const QString& path) {
   edit_->SlotOpenFile(path);
 }
 
-void MainWindow::slot_version_upgrade_nofity() {
+void MainWindow::slot_version_upgrade_notify() {
   GF_UI_LOG_DEBUG(
       "slot version upgrade notify called, checking version info from rt...");
   auto is_loading_done = Module::RetrieveRTValueTypedOrDefault<>(
-      "com.bktus.gpgfrontend.module.integrated.version-checking",
-      "version.loading_done", false);
+      kVersionCheckingModuleID, "version.loading_done", false);
 
   GF_UI_LOG_DEBUG("checking version info from rt, is loading done state: {}",
                   is_loading_done);
@@ -276,20 +276,16 @@ void MainWindow::slot_version_upgrade_nofity() {
   }
 
   auto is_need_upgrade = Module::RetrieveRTValueTypedOrDefault<>(
-      "com.bktus.gpgfrontend.module.integrated.version-checking",
-      "version.need_upgrade", false);
+      kVersionCheckingModuleID, "version.need_upgrade", false);
 
   auto is_current_a_withdrawn_version = Module::RetrieveRTValueTypedOrDefault<>(
-      "com.bktus.gpgfrontend.module.integrated.version-checking",
-      "version.current_a_withdrawn_version", false);
+      kVersionCheckingModuleID, "version.current_a_withdrawn_version", false);
 
   auto is_current_version_released = Module::RetrieveRTValueTypedOrDefault<>(
-      "com.bktus.gpgfrontend.module.integrated.version-checking",
-      "version.current_version_released", false);
+      kVersionCheckingModuleID, "version.current_version_released", false);
 
   auto latest_version = Module::RetrieveRTValueTypedOrDefault<>(
-      "com.bktus.gpgfrontend.module.integrated.version-checking",
-      "version.latest_version", QString{});
+      kVersionCheckingModuleID, "version.latest_version", QString{});
 
   GF_UI_LOG_DEBUG(
       "got version info from rt, need upgrade: {}, with drawn: {}, "
@@ -303,7 +299,7 @@ void MainWindow::slot_version_upgrade_nofity() {
         30000);
     auto* update_button = new QPushButton("Update GpgFrontend", this);
     connect(update_button, &QPushButton::clicked, [=]() {
-      auto* about_dialog = new AboutDialog(2, this);
+      auto* about_dialog = new AboutDialog(tr("Update"), this);
       about_dialog->show();
     });
     statusBar()->addPermanentWidget(update_button, 0);