aboutsummaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorsaturneric <[email protected]>2025-04-17 16:54:03 +0000
committersaturneric <[email protected]>2025-04-17 16:54:03 +0000
commitb84e661438dc0dba5862ee741fd4d1d0f881e2f6 (patch)
tree2822bffc3f1d4496837988bcffd00cfcce498790 /src/core
parentfeat: generate cark keys (diff)
downloadGpgFrontend-b84e661438dc0dba5862ee741fd4d1d0f881e2f6.tar.gz
GpgFrontend-b84e661438dc0dba5862ee741fd4d1d0f881e2f6.zip
chore: update and check translations
Diffstat (limited to 'src/core')
-rw-r--r--src/core/function/gpg/GpgAutomatonHandler.cpp2
-rw-r--r--src/core/function/gpg/GpgAutomatonHandler.h2
-rw-r--r--src/core/function/gpg/GpgSmartCardManager.cpp8
-rw-r--r--src/core/model/GpgKeyTableModel.cpp23
4 files changed, 15 insertions, 20 deletions
diff --git a/src/core/function/gpg/GpgAutomatonHandler.cpp b/src/core/function/gpg/GpgAutomatonHandler.cpp
index 6cf06ab6..656bb018 100644
--- a/src/core/function/gpg/GpgAutomatonHandler.cpp
+++ b/src/core/function/gpg/GpgAutomatonHandler.cpp
@@ -28,8 +28,6 @@
#include "GpgAutomatonHandler.h"
-#include <utility>
-
#include "core/model/GpgData.h"
#include "core/model/GpgKey.h"
#include "core/utils/GpgUtils.h"
diff --git a/src/core/function/gpg/GpgAutomatonHandler.h b/src/core/function/gpg/GpgAutomatonHandler.h
index d142bbcc..4363cf30 100644
--- a/src/core/function/gpg/GpgAutomatonHandler.h
+++ b/src/core/function/gpg/GpgAutomatonHandler.h
@@ -28,8 +28,6 @@
#pragma once
-#include <utility>
-
#include "core/GpgFrontendCore.h"
#include "core/function/basic/GpgFunctionObject.h"
#include "core/function/gpg/GpgContext.h"
diff --git a/src/core/function/gpg/GpgSmartCardManager.cpp b/src/core/function/gpg/GpgSmartCardManager.cpp
index 9937ef7a..422f0b20 100644
--- a/src/core/function/gpg/GpgSmartCardManager.cpp
+++ b/src/core/function/gpg/GpgSmartCardManager.cpp
@@ -370,9 +370,9 @@ auto GpgSmartCardManager::GenerateKey(
return QString{};
};
- GpgAutomatonHandler::GetInstance(GetChannel())
- .DoCardInteract(serial_number, next_state_handler, action_handler);
-
- return {true, {}};
+ return {
+ GpgAutomatonHandler::GetInstance(GetChannel())
+ .DoCardInteract(serial_number, next_state_handler, action_handler),
+ "unknown error"};
}
} // namespace GpgFrontend \ No newline at end of file
diff --git a/src/core/model/GpgKeyTableModel.cpp b/src/core/model/GpgKeyTableModel.cpp
index db456431..d5de3844 100644
--- a/src/core/model/GpgKeyTableModel.cpp
+++ b/src/core/model/GpgKeyTableModel.cpp
@@ -154,14 +154,13 @@ auto GpgKeyTableModel::table_data_by_gpg_key_group(
auto GpgKeyTableModel::table_tooltip_by_gpg_key(
const QModelIndex & /*index*/, const GpgKey *key) const -> QVariant {
QStringList tooltip_lines;
- tooltip_lines << tr("ID: %1").arg(key->ID());
- tooltip_lines << tr("Algo: %1").arg(key->Algo());
- tooltip_lines << tr("Usage: %1").arg(GetUsagesByAbstractKey(key));
- tooltip_lines << tr("Trust: %1").arg(key->OwnerTrust());
- tooltip_lines << tr("Comment: %1")
- .arg(key->Comment().isEmpty()
- ? "<" + tr("No Comment") + ">"
- : key->Comment());
+ tooltip_lines << tr("ID") + ": " + key->ID();
+ tooltip_lines << tr("Algo") + ": " + key->Algo();
+ tooltip_lines << tr("Usage") + ": " + GetUsagesByAbstractKey(key);
+ tooltip_lines << tr("Trust") + ": " + key->OwnerTrust();
+ tooltip_lines << tr("Comment") + ": " +
+ (key->Comment().isEmpty() ? "<" + tr("No Comment") + ">"
+ : key->Comment());
const auto s_keys = key->SubKeys();
if (!s_keys.empty()) {
@@ -172,10 +171,10 @@ auto GpgKeyTableModel::table_tooltip_by_gpg_key(
for (const auto &s_key : s_keys) {
if (count++ >= 8) break;
const auto usages = GetUsagesByAbstractKey(&s_key);
- tooltip_lines << tr(" - ID: %1 | Algo: %2 | Usage: %3")
- .arg(s_key.ID())
- .arg(s_key.Algo())
- .arg(usages.trimmed());
+ tooltip_lines << " - " + tr("ID: %1 | Algo: %2 | Usage: %3")
+ .arg(s_key.ID())
+ .arg(s_key.Algo())
+ .arg(usages.trimmed());
}
}