feat: improve KeyGenerateDialog

2 files changed, 48 insertions, 48 deletions

diff --git a/src/test/core/GpgCoreTestKeygen.cpp b/src/test/core/GpgCoreTestKeygen.cpp
index aa4de244..63b6ad17 100644
--- a/src/test/core/GpgCoreTestKeygen.cpp
+++ b/src/test/core/GpgCoreTestKeygen.cpp
@@ -29,16 +29,16 @@
 #include "GpgCoreTest.h"
 #include "core/function/gpg/GpgKeyGetter.h"
 #include "core/function/gpg/GpgKeyOpera.h"
-#include "core/model/GpgGenKeyInfo.h"
 #include "core/model/GpgGenerateKeyResult.h"
 #include "core/model/GpgKey.h"
+#include "core/model/GpgKeyGenerateInfo.h"
 #include "core/utils/GpgUtils.h"
 #include "core/utils/MemoryUtils.h"
 
 namespace GpgFrontend::Test {
 
 TEST_F(GpgCoreTest, SearchPrimaryKeyAlgoTest) {
-  auto [find, algo] = GenKeyInfo::SearchPrimaryKeyAlgo("rsa2048");
+  auto [find, algo] = KeyGenerateInfo::SearchPrimaryKeyAlgo("rsa2048");
   ASSERT_TRUE(find);
   ASSERT_EQ(algo.Id(), "rsa2048");
   ASSERT_EQ(algo.Id(), "rsa2048");
@@ -48,7 +48,7 @@ TEST_F(GpgCoreTest, SearchPrimaryKeyAlgoTest) {
 }
 
 TEST_F(GpgCoreTest, SearchSubKeyAlgoTest) {
-  auto [find, algo] = GenKeyInfo::SearchSubKeyAlgo("rsa2048");
+  auto [find, algo] = KeyGenerateInfo::SearchSubKeyAlgo("rsa2048");
   ASSERT_TRUE(find);
   ASSERT_EQ(algo.Id(), "rsa2048");
   ASSERT_EQ(algo.Name(), "RSA");
@@ -57,12 +57,12 @@ TEST_F(GpgCoreTest, SearchSubKeyAlgoTest) {
 }
 
 TEST_F(GpgCoreTest, GenerateKeyRSA2048Test) {
-  auto p_info = QSharedPointer<GenKeyInfo>::create();
+  auto p_info = QSharedPointer<KeyGenerateInfo>::create();
   p_info->SetName("foo_0");
   p_info->SetEmail("[email protected]");
   p_info->SetComment("foobar");
 
-  auto [found, algo] = GenKeyInfo::SearchPrimaryKeyAlgo("rsa2048");
+  auto [found, algo] = KeyGenerateInfo::SearchPrimaryKeyAlgo("rsa2048");
   ASSERT_TRUE(found);
   ASSERT_EQ(algo.Id(), "rsa2048");
   p_info->SetAlgo(algo);
@@ -107,12 +107,12 @@ TEST_F(GpgCoreTest, GenerateKeyRSA2048Test) {
 }
 
 TEST_F(GpgCoreTest, GenerateKeyRSA4096Test) {
-  auto p_info = QSharedPointer<GenKeyInfo>::create();
+  auto p_info = QSharedPointer<KeyGenerateInfo>::create();
   p_info->SetName("foo_1");
   p_info->SetEmail("[email protected]");
   p_info->SetComment("hello gpgfrontend");
 
-  auto [found, algo] = GenKeyInfo::SearchPrimaryKeyAlgo("rsa4096");
+  auto [found, algo] = KeyGenerateInfo::SearchPrimaryKeyAlgo("rsa4096");
   ASSERT_TRUE(found);
   ASSERT_EQ(algo.Id(), "rsa4096");
   p_info->SetAlgo(algo);
@@ -146,12 +146,12 @@ TEST_F(GpgCoreTest, GenerateKeyRSA4096Test) {
 }
 
 TEST_F(GpgCoreTest, GenerateKeyDSA2048Test) {
-  auto p_info = QSharedPointer<GenKeyInfo>::create();
+  auto p_info = QSharedPointer<KeyGenerateInfo>::create();
   p_info->SetName("foo_1");
   p_info->SetEmail("[email protected]");
   p_info->SetComment("hello gpgfrontend");
 
-  auto [found, algo] = GenKeyInfo::SearchPrimaryKeyAlgo("dsa2048");
+  auto [found, algo] = KeyGenerateInfo::SearchPrimaryKeyAlgo("dsa2048");
   ASSERT_TRUE(found);
   ASSERT_EQ(algo.Id(), "dsa2048");
   p_info->SetAlgo(algo);
@@ -200,12 +200,12 @@ TEST_F(GpgCoreTest, GenerateKeyDSA2048Test) {
 }
 
 TEST_F(GpgCoreTest, GenerateKeyED25519Test) {
-  auto p_info = QSharedPointer<GenKeyInfo>::create();
+  auto p_info = QSharedPointer<KeyGenerateInfo>::create();
   p_info->SetName("foo_4");
   p_info->SetEmail("[email protected]");
   p_info->SetComment("hello gpgfrontend");
 
-  auto [found, algo] = GenKeyInfo::SearchPrimaryKeyAlgo("ed25519");
+  auto [found, algo] = KeyGenerateInfo::SearchPrimaryKeyAlgo("ed25519");
   ASSERT_TRUE(found);
   ASSERT_EQ(algo.Id(), "ed25519");
   p_info->SetAlgo(algo);
@@ -254,12 +254,12 @@ TEST_F(GpgCoreTest, GenerateKeyED25519Test) {
 }
 
 TEST_F(GpgCoreTest, GenerateKeyED25519CV25519Test) {
-  auto p_info = QSharedPointer<GenKeyInfo>::create();
+  auto p_info = QSharedPointer<KeyGenerateInfo>::create();
   p_info->SetName("foo_ec");
   p_info->SetEmail("[email protected]");
   p_info->SetComment("ecccc");
 
-  auto [found, algo] = GenKeyInfo::SearchPrimaryKeyAlgo("ed25519");
+  auto [found, algo] = KeyGenerateInfo::SearchPrimaryKeyAlgo("ed25519");
   ASSERT_TRUE(found);
   ASSERT_EQ(algo.Id(), "ed25519");
   p_info->SetAlgo(algo);
@@ -267,9 +267,9 @@ TEST_F(GpgCoreTest, GenerateKeyED25519CV25519Test) {
   p_info->SetNonExpired(true);
   p_info->SetNonPassPhrase(true);
 
-  auto s_info = QSharedPointer<GenKeyInfo>::create(true);
+  auto s_info = QSharedPointer<KeyGenerateInfo>::create(true);
 
-  std::tie(found, algo) = GenKeyInfo::SearchSubKeyAlgo("cv25519");
+  std::tie(found, algo) = KeyGenerateInfo::SearchSubKeyAlgo("cv25519");
   ASSERT_TRUE(found);
   ASSERT_EQ(algo.Id(), "cv25519");
   s_info->SetAlgo(algo);
@@ -329,12 +329,12 @@ TEST_F(GpgCoreTest, GenerateKeyED25519CV25519Test) {
 }
 
 TEST_F(GpgCoreTest, GenerateKeyED25519NISTP256Test) {
-  auto p_info = QSharedPointer<GenKeyInfo>::create();
+  auto p_info = QSharedPointer<KeyGenerateInfo>::create();
   p_info->SetName("foo_ec2");
   p_info->SetEmail("[email protected]");
   p_info->SetComment("ecccc");
 
-  auto [found, algo] = GenKeyInfo::SearchPrimaryKeyAlgo("ed25519");
+  auto [found, algo] = KeyGenerateInfo::SearchPrimaryKeyAlgo("ed25519");
   ASSERT_TRUE(found);
   ASSERT_EQ(algo.Id(), "ed25519");
   p_info->SetAlgo(algo);
@@ -342,9 +342,9 @@ TEST_F(GpgCoreTest, GenerateKeyED25519NISTP256Test) {
   p_info->SetNonExpired(true);
   p_info->SetNonPassPhrase(true);
 
-  auto s_info = QSharedPointer<GenKeyInfo>::create(true);
+  auto s_info = QSharedPointer<KeyGenerateInfo>::create(true);
 
-  std::tie(found, algo) = GenKeyInfo::SearchSubKeyAlgo("nistp256");
+  std::tie(found, algo) = KeyGenerateInfo::SearchSubKeyAlgo("nistp256");
   ASSERT_TRUE(found);
   ASSERT_EQ(algo.Id(), "nistp256");
   s_info->SetAlgo(algo);
@@ -404,12 +404,12 @@ TEST_F(GpgCoreTest, GenerateKeyED25519NISTP256Test) {
 }
 
 TEST_F(GpgCoreTest, GenerateKeyED25519BRAINPOOLP256R1Test) {
-  auto p_info = QSharedPointer<GenKeyInfo>::create();
+  auto p_info = QSharedPointer<KeyGenerateInfo>::create();
   p_info->SetName("foo_ec3");
   p_info->SetEmail("[email protected]");
   p_info->SetComment("ecccc3");
 
-  auto [found, algo] = GenKeyInfo::SearchPrimaryKeyAlgo("ed25519");
+  auto [found, algo] = KeyGenerateInfo::SearchPrimaryKeyAlgo("ed25519");
   ASSERT_TRUE(found);
   ASSERT_EQ(algo.Id(), "ed25519");
   p_info->SetAlgo(algo);
@@ -417,9 +417,9 @@ TEST_F(GpgCoreTest, GenerateKeyED25519BRAINPOOLP256R1Test) {
   p_info->SetNonExpired(true);
   p_info->SetNonPassPhrase(true);
 
-  auto s_info = QSharedPointer<GenKeyInfo>::create(true);
+  auto s_info = QSharedPointer<KeyGenerateInfo>::create(true);
 
-  std::tie(found, algo) = GenKeyInfo::SearchSubKeyAlgo("brainpoolp256r1");
+  std::tie(found, algo) = KeyGenerateInfo::SearchSubKeyAlgo("brainpoolp256r1");
   ASSERT_TRUE(found);
   ASSERT_EQ(algo.Id(), "brainpoolp256r1");
   s_info->SetAlgo(algo);
@@ -479,12 +479,12 @@ TEST_F(GpgCoreTest, GenerateKeyED25519BRAINPOOLP256R1Test) {
 }
 
 TEST_F(GpgCoreTest, GenerateKeyNISTP256Test) {
-  auto p_info = QSharedPointer<GenKeyInfo>::create();
+  auto p_info = QSharedPointer<KeyGenerateInfo>::create();
   p_info->SetName("foo_4");
   p_info->SetEmail("[email protected]");
   p_info->SetComment("hello gpgfrontend");
 
-  auto [found, algo] = GenKeyInfo::SearchPrimaryKeyAlgo("nistp256");
+  auto [found, algo] = KeyGenerateInfo::SearchPrimaryKeyAlgo("nistp256");
   ASSERT_TRUE(found);
   ASSERT_EQ(algo.Id(), "nistp256");
   p_info->SetAlgo(algo);
@@ -534,12 +534,12 @@ TEST_F(GpgCoreTest, GenerateKeyNISTP256Test) {
 }
 
 TEST_F(GpgCoreTest, GenerateKeyED448Test) {
-  auto p_info = QSharedPointer<GenKeyInfo>::create();
+  auto p_info = QSharedPointer<KeyGenerateInfo>::create();
   p_info->SetName("foo_4");
   p_info->SetEmail("[email protected]");
   p_info->SetComment("hello gpgfrontend");
 
-  auto [found, algo] = GenKeyInfo::SearchPrimaryKeyAlgo("ed448");
+  auto [found, algo] = KeyGenerateInfo::SearchPrimaryKeyAlgo("ed448");
   ASSERT_TRUE(found);
   ASSERT_EQ(algo.Id(), "ed448");
   p_info->SetAlgo(algo);
@@ -589,12 +589,12 @@ TEST_F(GpgCoreTest, GenerateKeyED448Test) {
 }
 
 TEST_F(GpgCoreTest, GenerateKeySECP256K1Test) {
-  auto p_info = QSharedPointer<GenKeyInfo>::create();
+  auto p_info = QSharedPointer<KeyGenerateInfo>::create();
   p_info->SetName("foo_4");
   p_info->SetEmail("[email protected]");
   p_info->SetComment("hello gpgfrontend");
 
-  auto [found, algo] = GenKeyInfo::SearchPrimaryKeyAlgo("secp256k1");
+  auto [found, algo] = KeyGenerateInfo::SearchPrimaryKeyAlgo("secp256k1");
   ASSERT_TRUE(found);
   ASSERT_EQ(algo.Id(), "secp256k1");
   p_info->SetAlgo(algo);
diff --git a/src/test/core/GpgCoreTestSubkeygen.cpp b/src/test/core/GpgCoreTestSubkeygen.cpp
index 886a6f04..af78a953 100644
--- a/src/test/core/GpgCoreTestSubkeygen.cpp
+++ b/src/test/core/GpgCoreTestSubkeygen.cpp
@@ -29,9 +29,9 @@
 #include "GpgCoreTest.h"
 #include "core/function/gpg/GpgKeyGetter.h"
 #include "core/function/gpg/GpgKeyOpera.h"
-#include "core/model/GpgGenKeyInfo.h"
 #include "core/model/GpgGenerateKeyResult.h"
 #include "core/model/GpgKey.h"
+#include "core/model/GpgKeyGenerateInfo.h"
 #include "core/utils/GpgUtils.h"
 #include "core/utils/MemoryUtils.h"
 
@@ -42,9 +42,9 @@ TEST_F(GpgCoreTest, GenerateSubkeyRSA2048Test) {
       "E87C6A2D8D95C818DE93B3AE6A2764F8298DEB29");
   ASSERT_TRUE(p_key.IsGood());
 
-  auto s_info = QSharedPointer<GenKeyInfo>::create(true);
+  auto s_info = QSharedPointer<KeyGenerateInfo>::create(true);
 
-  auto [found, algo] = GenKeyInfo::SearchSubKeyAlgo("rsa2048");
+  auto [found, algo] = KeyGenerateInfo::SearchSubKeyAlgo("rsa2048");
   ASSERT_TRUE(found);
   ASSERT_EQ(algo.Id(), "rsa2048");
   s_info->SetAlgo(algo);
@@ -85,9 +85,9 @@ TEST_F(GpgCoreTest, GenerateSubkeyDSA2048Test) {
       "E87C6A2D8D95C818DE93B3AE6A2764F8298DEB29");
   ASSERT_TRUE(p_key.IsGood());
 
-  auto s_info = QSharedPointer<GenKeyInfo>::create(true);
+  auto s_info = QSharedPointer<KeyGenerateInfo>::create(true);
 
-  auto [found, algo] = GenKeyInfo::SearchSubKeyAlgo("dsa2048");
+  auto [found, algo] = KeyGenerateInfo::SearchSubKeyAlgo("dsa2048");
   ASSERT_TRUE(found);
   ASSERT_EQ(algo.Id(), "dsa2048");
   s_info->SetAlgo(algo);
@@ -128,9 +128,9 @@ TEST_F(GpgCoreTest, GenerateSubkeyELG2048Test) {
       "E87C6A2D8D95C818DE93B3AE6A2764F8298DEB29");
   ASSERT_TRUE(p_key.IsGood());
 
-  auto s_info = QSharedPointer<GenKeyInfo>::create(true);
+  auto s_info = QSharedPointer<KeyGenerateInfo>::create(true);
 
-  auto [found, algo] = GenKeyInfo::SearchSubKeyAlgo("elg2048");
+  auto [found, algo] = KeyGenerateInfo::SearchSubKeyAlgo("elg2048");
   ASSERT_TRUE(found);
   ASSERT_EQ(algo.Id(), "elg2048");
   s_info->SetAlgo(algo);
@@ -171,9 +171,9 @@ TEST_F(GpgCoreTest, GenerateSubkeyED25519Test) {
       "E87C6A2D8D95C818DE93B3AE6A2764F8298DEB29");
   ASSERT_TRUE(p_key.IsGood());
 
-  auto s_info = QSharedPointer<GenKeyInfo>::create(true);
+  auto s_info = QSharedPointer<KeyGenerateInfo>::create(true);
 
-  auto [found, algo] = GenKeyInfo::SearchSubKeyAlgo("ed25519");
+  auto [found, algo] = KeyGenerateInfo::SearchSubKeyAlgo("ed25519");
   ASSERT_TRUE(found);
   ASSERT_EQ(algo.Id(), "ed25519");
   s_info->SetAlgo(algo);
@@ -214,9 +214,9 @@ TEST_F(GpgCoreTest, GenerateSubkeyCV25519Test) {
       "E87C6A2D8D95C818DE93B3AE6A2764F8298DEB29");
   ASSERT_TRUE(p_key.IsGood());
 
-  auto s_info = QSharedPointer<GenKeyInfo>::create(true);
+  auto s_info = QSharedPointer<KeyGenerateInfo>::create(true);
 
-  auto [found, algo] = GenKeyInfo::SearchSubKeyAlgo("cv25519");
+  auto [found, algo] = KeyGenerateInfo::SearchSubKeyAlgo("cv25519");
   ASSERT_TRUE(found);
   ASSERT_EQ(algo.Id(), "cv25519");
   s_info->SetAlgo(algo);
@@ -257,9 +257,9 @@ TEST_F(GpgCoreTest, GenerateSubkeyNISTP256Test) {
       "E87C6A2D8D95C818DE93B3AE6A2764F8298DEB29");
   ASSERT_TRUE(p_key.IsGood());
 
-  auto s_info = QSharedPointer<GenKeyInfo>::create(true);
+  auto s_info = QSharedPointer<KeyGenerateInfo>::create(true);
 
-  auto [found, algo] = GenKeyInfo::SearchSubKeyAlgo("nistp256");
+  auto [found, algo] = KeyGenerateInfo::SearchSubKeyAlgo("nistp256");
   ASSERT_TRUE(found);
   ASSERT_EQ(algo.Id(), "nistp256");
   s_info->SetAlgo(algo);
@@ -299,9 +299,9 @@ TEST_F(GpgCoreTest, GenerateSubkeyBRAINPOOLP256R1Test) {
       "E87C6A2D8D95C818DE93B3AE6A2764F8298DEB29");
   ASSERT_TRUE(p_key.IsGood());
 
-  auto s_info = QSharedPointer<GenKeyInfo>::create(true);
+  auto s_info = QSharedPointer<KeyGenerateInfo>::create(true);
 
-  auto [found, algo] = GenKeyInfo::SearchSubKeyAlgo("brainpoolp256r1");
+  auto [found, algo] = KeyGenerateInfo::SearchSubKeyAlgo("brainpoolp256r1");
   ASSERT_TRUE(found);
   ASSERT_EQ(algo.Id(), "brainpoolp256r1");
   s_info->SetAlgo(algo);
@@ -341,9 +341,9 @@ TEST_F(GpgCoreTest, GenerateSubkeyX448Test) {
       "E87C6A2D8D95C818DE93B3AE6A2764F8298DEB29");
   ASSERT_TRUE(p_key.IsGood());
 
-  auto s_info = QSharedPointer<GenKeyInfo>::create(true);
+  auto s_info = QSharedPointer<KeyGenerateInfo>::create(true);
 
-  auto [found, algo] = GenKeyInfo::SearchSubKeyAlgo("x448");
+  auto [found, algo] = KeyGenerateInfo::SearchSubKeyAlgo("x448");
   ASSERT_TRUE(found);
   ASSERT_EQ(algo.Id(), "x448");
   s_info->SetAlgo(algo);
@@ -383,9 +383,9 @@ TEST_F(GpgCoreTest, GenerateSubkeySECP256K1Test) {
       "E87C6A2D8D95C818DE93B3AE6A2764F8298DEB29");
   ASSERT_TRUE(p_key.IsGood());
 
-  auto s_info = QSharedPointer<GenKeyInfo>::create(true);
+  auto s_info = QSharedPointer<KeyGenerateInfo>::create(true);
 
-  auto [found, algo] = GenKeyInfo::SearchSubKeyAlgo("secp256k1");
+  auto [found, algo] = KeyGenerateInfo::SearchSubKeyAlgo("secp256k1");
   ASSERT_TRUE(found);
   ASSERT_EQ(algo.Id(), "secp256k1");
   s_info->SetAlgo(algo);