feat: improve ui logic and support more email operations

1 files changed, 15 insertions, 25 deletions

diff --git a/src/ui/main_window/MainWindowUI.cpp b/src/ui/main_window/MainWindowUI.cpp
index 9c2a5003..7728d0ae 100644
--- a/src/ui/main_window/MainWindowUI.cpp
+++ b/src/ui/main_window/MainWindowUI.cpp
@@ -260,17 +260,11 @@ void MainWindow::create_actions() {
    * E-Mail Menu
    */
   if (Module::IsModuleActivate(kEmailModuleID)) {
-    verify_email_by_eml_data_act_ = create_action(
-        "verify_email_by_eml_data", tr("Verify E-Mail"),
-        ":/icons/email-check.png", tr("Verify RAW E-Mail Data (EML)"));
-    connect(verify_email_by_eml_data_act_, &QAction::triggered, this,
-            &MainWindow::SlotGeneralVerifyEMail);
-
-    decrypt_email_by_eml_data_act_ = create_action(
-        "decrypt_email_by_eml_data", tr("Decrypt E-Mail"),
-        ":/icons/email-open.png", tr("Decrypt RAW E-Mail Data (EML)"));
-    connect(decrypt_email_by_eml_data_act_, &QAction::triggered, this,
-            &MainWindow::SlotGeneralDecryptEMail);
+    new_email_tab_act_ =
+        create_action("new_email_tab", tr("New E-Mail"), ":/icons/email.png",
+                      tr("Create A New E-Mail Tab"));
+    connect(new_email_tab_act_, &QAction::triggered, edit_,
+            &TextEdit::SlotNewEMailTab);
   }
 
   /*
@@ -407,6 +401,11 @@ void MainWindow::create_actions() {
 void MainWindow::create_menus() {
   file_menu_ = menuBar()->addMenu(tr("File"));
   file_menu_->addAction(new_tab_act_);
+
+  if (Module::IsModuleActivate(kEmailModuleID)) {
+    file_menu_->addAction(new_email_tab_act_);
+  }
+
   file_menu_->addAction(browser_act_);
   file_menu_->addAction(open_act_);
   file_menu_->addSeparator();
@@ -465,12 +464,6 @@ void MainWindow::create_menus() {
   advance_menu_->addAction(gnupg_controller_open_act_);
   advance_menu_->addAction(module_controller_open_act_);
 
-  if (Module::IsModuleActivate(kEmailModuleID)) {
-    email_menu_ = menuBar()->addMenu(tr("E-Mail"));
-    email_menu_->addAction(verify_email_by_eml_data_act_);
-    email_menu_->addAction(decrypt_email_by_eml_data_act_);
-  }
-
   view_menu_ = menuBar()->addMenu(tr("View"));
 
   help_menu_ = menuBar()->addMenu(tr("Help"));
@@ -494,6 +487,11 @@ void MainWindow::create_tool_bars() {
   file_tool_bar_ = addToolBar(tr("File"));
   file_tool_bar_->setObjectName("fileToolBar");
   file_tool_bar_->addAction(new_tab_act_);
+
+  if (Module::IsModuleActivate(kEmailModuleID)) {
+    file_tool_bar_->addAction(new_email_tab_act_);
+  }
+
   file_tool_bar_->addAction(open_act_);
   file_tool_bar_->addAction(browser_act_);
   view_menu_->addAction(file_tool_bar_->toggleViewAction());
@@ -530,14 +528,6 @@ void MainWindow::create_tool_bars() {
   special_edit_tool_bar_->hide();
   view_menu_->addAction(special_edit_tool_bar_->toggleViewAction());
 
-  if (Module::IsModuleActivate(kEmailModuleID)) {
-    email_tool_bar_ = addToolBar(tr("E-Mail"));
-    email_tool_bar_->setObjectName("emailToolBar");
-    email_tool_bar_->addAction(verify_email_by_eml_data_act_);
-    email_tool_bar_->addAction(decrypt_email_by_eml_data_act_);
-    view_menu_->addAction(email_tool_bar_->toggleViewAction());
-  }
-
   // Add dropdown menu for key import to keytoolbar
   import_button_ = new QToolButton();
   import_button_->setMenu(import_key_menu_);