1 files changed, 54 insertions, 65 deletions

diff --git a/src/ui/dialog/keypair_details/KeyPairUIDTab.h b/src/ui/dialog/keypair_details/KeyPairUIDTab.h
index bf0988fa..d97ea2d8 100644
--- a/src/ui/dialog/keypair_details/KeyPairUIDTab.h
+++ b/src/ui/dialog/keypair_details/KeyPairUIDTab.h
@@ -28,9 +28,7 @@
 
 #pragma once
 
-#include "KeyNewUIDDialog.h"
-#include "KeyUIDSignDialog.h"
-#include "core/function/gpg/GpgContext.h"
+#include "core/GpgModel.h"
 #include "ui/GpgFrontendUI.h"
 
 namespace GpgFrontend::UI {
@@ -55,151 +53,142 @@ class KeyPairUIDTab : public QWidget {
    */
   void SignalUpdateUIDInfo();
 
- private:
-  int current_gpg_context_channel_;
-  GpgKey m_key_;
-  QTableWidget* uid_list_{};                          ///<
-  QTableWidget* sig_list_{};                          ///<
-  QTabWidget* tofu_tabs_{};                           ///<
-  QMenu* manage_selected_uid_menu_{};                 ///<
-  QMenu* uid_popup_menu_{};                           ///<
-  QMenu* sign_popup_menu_{};                          ///<
-  std::vector<GpgUID> buffered_uids_;                 ///<
-  std::vector<GpgKeySignature> buffered_signatures_;  ///<
-
-  /**
-   * @brief Create a uid list object
-   *
-   */
-  void create_uid_list();
-
+ protected:
   /**
-   * @brief Create a sign list object
+   * @brief
    *
+   * @param event
    */
-  void create_sign_list();
+  void contextMenuEvent(QContextMenuEvent* event) override;
 
-  /**
-   * @brief Create a manage uid menu object
-   *
-   */
-  void create_manage_uid_menu();
+ private slots:
 
   /**
-   * @brief Create a uid popup menu object
+   * @brief
    *
    */
-  void create_uid_popup_menu();
+  void slot_refresh_uid_list();
 
   /**
-   * @brief Create a sign popup menu object
+   * @brief
    *
    */
-  void create_sign_popup_menu();
+  void slot_refresh_tofu_info();
 
   /**
-   * @brief Get the uid checked object
+   * @brief
    *
-   * @return UIDArgsListPtr
    */
-  UIDArgsListPtr get_uid_checked();
+  void slot_refresh_sig_list();
 
   /**
-   * @brief Get the uid selected object
+   * @brief
    *
-   * @return UIDArgsListPtr
    */
-  UIDArgsListPtr get_uid_selected();
+  void slot_add_sign();
 
   /**
-   * @brief Get the sign selected object
+   * @brief
    *
-   * @return SignIdArgsListPtr
    */
-  SignIdArgsListPtr get_sign_selected();
-
- private slots:
+  void slot_add_sign_single();
 
   /**
    * @brief
    *
    */
-  void slot_refresh_uid_list();
+  void slot_add_uid();
 
   /**
    * @brief
    *
    */
-  void slot_refresh_tofu_info();
+  void slot_del_uid();
 
   /**
    * @brief
    *
    */
-  void slot_refresh_sig_list();
+  void slot_rev_uid();
 
   /**
    * @brief
    *
    */
-  void slot_add_sign();
+  void slot_set_primary_uid();
 
   /**
    * @brief
    *
    */
-  void slot_add_sign_single();
+  void slot_del_sign();
 
   /**
    * @brief
    *
    */
-  void slot_add_uid();
+  void slot_refresh_key();
 
   /**
    * @brief
    *
+   * @param result
    */
-  void slot_del_uid();
+  static void slot_add_uid_result(int result);
+
+ private:
+  int current_gpg_context_channel_;
+  GpgKey m_key_;
+  QTableWidget* uid_list_{};                          ///<
+  QTableWidget* sig_list_{};                          ///<
+  QTabWidget* tofu_tabs_{};                           ///<
+  QMenu* uid_popup_menu_{};                           ///<
+  QMenu* sign_popup_menu_{};                          ///<
+  std::vector<GpgUID> buffered_uids_;                 ///<
+  std::vector<GpgKeySignature> buffered_signatures_;  ///<
+
+  QAction* set_primary_uid_act_;
+  QAction* sign_uid_act_;
+  QAction* rev_uid_act_;
+  QAction* del_uid_act_;
 
   /**
-   * @brief
+   * @brief Create a uid list object
    *
    */
-  void slot_del_uid_single();
+  void create_uid_list();
 
   /**
-   * @brief
+   * @brief Create a sign list object
    *
    */
-  void slot_set_primary_uid();
+  void create_sign_list();
 
   /**
-   * @brief
+   * @brief Create a uid popup menu object
    *
    */
-  void slot_del_sign();
+  void create_uid_popup_menu();
 
   /**
-   * @brief
+   * @brief Create a sign popup menu object
    *
    */
-  void slot_refresh_key();
+  void create_sign_popup_menu();
 
   /**
-   * @brief
+   * @brief Get the sign selected object
    *
-   * @param result
+   * @return SignIdArgsListPtr
    */
-  static void slot_add_uid_result(int result);
+  auto get_sign_selected() -> SignIdArgsListPtr;
 
- protected:
   /**
-   * @brief
+   * @brief Get the sign selected object
    *
-   * @param event
+   * @return SignIdArgsListPtr
    */
-  void contextMenuEvent(QContextMenuEvent* event) override;
+  auto get_selected_uid() -> const GpgUID&;
 };
 
 }  // namespace GpgFrontend::UI