Merge pull request #91 from saturneric/dev/2.0.10/main

Develop 2.1.0.1

1 files changed, 18 insertions, 6 deletions

diff --git a/src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp b/src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp
index 2c10b895..d09662e1 100644
--- a/src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp
+++ b/src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp
@@ -57,16 +57,23 @@ KeySetExpireDateDialog::KeySetExpireDateDialog(const KeyId& key_id,
 }
 
 void KeySetExpireDateDialog::slot_confirm() {
-  LOG(INFO) << "Called" << ui_->dateEdit->date().toString().toStdString()
-            << ui_->timeEdit->time().toString().toStdString();
+  SPDLOG_DEBUG("called: {} {}", ui_->dateEdit->date().toString().toStdString(),
+               ui_->timeEdit->time().toString().toStdString());
   auto datetime = QDateTime(ui_->dateEdit->date(), ui_->timeEdit->time());
   std::unique_ptr<boost::posix_time::ptime> expires = nullptr;
   if (ui_->noExpirationCheckBox->checkState() == Qt::Unchecked) {
+#ifdef GPGFRONTEND_GUI_QT6
+    expires = std::make_unique<boost::posix_time::ptime>(
+        boost::posix_time::from_time_t(
+            datetime.toLocalTime().toSecsSinceEpoch()));
+#else
     expires = std::make_unique<boost::posix_time::ptime>(
         boost::posix_time::from_time_t(datetime.toLocalTime().toTime_t()));
-    LOG(INFO) << "keyid" << m_key_.GetId() << m_subkey_ << *expires;
+#endif
+    SPDLOG_DEBUG("keyid: {}", m_key_.GetId(), m_subkey_,
+                 to_iso_string(*expires));
   } else {
-    LOG(INFO) << "keyid" << m_key_.GetId() << m_subkey_ << "Non Expired";
+    SPDLOG_DEBUG("keyid: {}", m_key_.GetId(), m_subkey_, "Non Expired");
   }
 
   auto err = GpgKeyOpera::GetInstance().SetExpire(m_key_, m_subkey_, expires);
@@ -98,10 +105,10 @@ void KeySetExpireDateDialog::init() {
   bool longer_expiration_date = false;
   try {
     longer_expiration_date = settings.lookup("general.longer_expiration_date");
-    LOG(INFO) << "longer_expiration_date" << longer_expiration_date;
+    SPDLOG_DEBUG("longer_expiration_date: {}", longer_expiration_date);
 
   } catch (...) {
-    LOG(ERROR) << _("Setting Operation Error") << _("longer_expiration_date");
+    SPDLOG_ERROR("setting operation error: longer_expiration_date");
   }
 
   auto max_date_time =
@@ -115,8 +122,13 @@ void KeySetExpireDateDialog::init() {
   ui_->dateEdit->setMinimumDateTime(min_date_time);
 
   // set default date time to expire date time
+#ifdef GPGFRONTEND_GUI_QT6
+  auto current_expire_time =
+      QDateTime::fromSecsSinceEpoch(to_time_t(m_key_.GetExpireTime()));
+#else
   auto current_expire_time =
       QDateTime::fromTime_t(to_time_t(m_key_.GetExpireTime()));
+#endif
   ui_->dateEdit->setDateTime(current_expire_time);
   ui_->timeEdit->setDateTime(current_expire_time);