aboutsummaryrefslogtreecommitdiffstats
path: root/src/ui/main_window/MainWindowSlotFunction.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/ui/main_window/MainWindowSlotFunction.cpp24
1 files changed, 14 insertions, 10 deletions
diff --git a/src/ui/main_window/MainWindowSlotFunction.cpp b/src/ui/main_window/MainWindowSlotFunction.cpp
index f715046c..6f702e34 100644
--- a/src/ui/main_window/MainWindowSlotFunction.cpp
+++ b/src/ui/main_window/MainWindowSlotFunction.cpp
@@ -36,9 +36,10 @@
#include "core/function/gpg/GpgBasicOperator.h"
#include "core/function/gpg/GpgKeyGetter.h"
#include "core/function/gpg/GpgKeyImportExporter.h"
+#include "dialog/SignersPicker.h"
+#include "spdlog/spdlog.h"
#include "ui/UserInterfaceUtils.h"
#include "ui/dialog/help/AboutDialog.h"
-#include "dialog/SignersPicker.h"
namespace GpgFrontend::UI {
/**
@@ -341,7 +342,7 @@ void MainWindow::slot_verify() {
auto buffer = data_object->PopObject<std::string>();
- LOG(INFO) << "Verify buffer: " << buffer.size();
+ SPDLOG_DEBUG("verify buffer size: {}", buffer.size());
try {
GpgVerifyResult verify_result = nullptr;
@@ -430,11 +431,11 @@ void MainWindow::slot_encrypt_sign() {
auto signer_keys = GpgKeyGetter::GetInstance().GetKeys(signer_key_ids);
for (const auto& key : *keys) {
- LOG(INFO) << "Keys " << key.GetEmail();
+ SPDLOG_DEBUG("keys {}", key.GetEmail());
}
for (const auto& signer : *signer_keys) {
- LOG(INFO) << "Signers " << signer.GetEmail();
+ SPDLOG_DEBUG("signers {}", signer.GetEmail());
}
// data to transfer into task
@@ -486,7 +487,6 @@ void MainWindow::slot_encrypt_sign() {
auto sign_result = data_object->PopObject<GpgSignResult>();
auto tmp = data_object->PopObject<std::unique_ptr<ByteArray>>();
- LOG(INFO) << "GpgResultAnalyse Started";
auto encrypt_result_analyse =
GpgEncryptResultAnalyse(error, std::move(encrypt_result));
auto sign_result_analyse =
@@ -544,7 +544,7 @@ void MainWindow::slot_decrypt_verify() {
data_object->AppendObject(std::move(decrypt_result));
data_object->AppendObject(std::move(error));
} catch (const std::runtime_error& e) {
- LOG(ERROR) << e.what();
+ SPDLOG_ERROR(e.what());
return -1;
}
return 0;
@@ -660,13 +660,17 @@ void MainWindow::upload_key_to_server() {
void MainWindow::SlotOpenFile(QString& path) { edit_->SlotOpenFile(path); }
void MainWindow::slot_version_upgrade(const SoftwareVersion& version) {
- LOG(INFO) << _("Called");
-
- if (!version.InfoVaild()) {
- LOG(INFO) << "Invalid version info";
+ if (!version.InfoValid()) {
+ SPDLOG_ERROR("invalid version info");
return;
}
+ SPDLOG_DEBUG(
+ "version info, need upgrade: {}, with drawn: {}, current version "
+ "released: {}",
+ version.NeedUpgrade(), version.VersionWithDrawn(),
+ version.CurrentVersionReleased());
+
if (version.NeedUpgrade()) {
statusBar()->showMessage(
QString(_("GpgFrontend Upgradeable (New Version: %1)."))