diff options
Diffstat (limited to 'src/ui/main_window')
-rw-r--r-- | src/ui/main_window/MainWindow.h | 7 | ||||
-rw-r--r-- | src/ui/main_window/MainWindowSlotFunction.cpp | 33 | ||||
-rw-r--r-- | src/ui/main_window/MainWindowUI.cpp | 32 |
3 files changed, 0 insertions, 72 deletions
diff --git a/src/ui/main_window/MainWindow.h b/src/ui/main_window/MainWindow.h index 5cc9a15a..c5ba02a2 100644 --- a/src/ui/main_window/MainWindow.h +++ b/src/ui/main_window/MainWindow.h @@ -341,7 +341,6 @@ class MainWindow : public QMainWindow { QToolBar* special_edit_tool_bar_{}; ///< Toolbar holding special edit actions QToolBar* key_tool_bar_{}; ///< Toolbar holding key operations - QToolBar* email_tool_bar_{}; ///< Toolbar holding key operations QToolButton* import_button_{}; ///< Tool button for import dropdown menu in toolbar QDockWidget* key_list_dock_{}; ///< Encrypt Dock @@ -391,12 +390,6 @@ class MainWindow : public QMainWindow { QAction* start_wizard_act_{}; ///< Action to open the wizard QAction* cut_pgp_header_act_{}; ///< Action for cutting the PGP header QAction* add_pgp_header_act_{}; ///< Action for adding the PGP header - -#ifdef SMTP_SUPPORT - QAction* send_mail_act_{}; ///< Action for sending a email - QAction* receive_mail_act_{}; ///< Action for receive emails -#endif - QAction* import_key_from_file_act_{}; ///< QAction* import_key_from_clipboard_act_{}; ///< QAction* import_key_from_key_server_act_{}; ///< diff --git a/src/ui/main_window/MainWindowSlotFunction.cpp b/src/ui/main_window/MainWindowSlotFunction.cpp index f25d696a..0a322f6a 100644 --- a/src/ui/main_window/MainWindowSlotFunction.cpp +++ b/src/ui/main_window/MainWindowSlotFunction.cpp @@ -28,17 +28,6 @@ #include "MainWindow.h" -#ifdef ADVANCE_SUPPORT -#include "advance/UnknownSignersChecker.h" -#endif -#ifdef SERVER_SUPPORT -#include "server/api/PubkeyUploader.h" -#endif - -#ifdef SMTP_SUPPORT -#include "ui/mail/SendMailDialog.h" -#endif - #include "core/function/GlobalSettingStation.h" #include "core/function/gpg/GpgBasicOperator.h" #include "core/function/gpg/GpgKeyGetter.h" @@ -121,11 +110,6 @@ void MainWindow::slot_encrypt() { if (check_gpg_error_2_err_code(error) == GPG_ERR_NO_ERROR) edit_->SlotFillTextEditWithText(QString::fromStdString(*tmp)); info_board_->ResetOptionActionsMenu(); -#ifdef SMTP_SUPPORT - if (check_gpg_error_2_err_code(error) == GPG_ERR_NO_ERROR) - send_an_email(this, info_board_, - edit_->CurTextPage()->GetTextPage()->toPlainText()); -#endif } else { QMessageBox::critical(this, _("Error"), _("An error occurred during operation.")); @@ -381,23 +365,6 @@ void MainWindow::slot_encrypt_sign() { edit_->SlotFillTextEditWithText(QString::fromStdString(*tmp)); info_board_->ResetOptionActionsMenu(); -#ifdef SMTP_SUPPORT - if (check_gpg_error_2_err_code(error) == GPG_ERR_NO_ERROR) - send_an_email(this, info_board_, - edit_->CurTextPage()->GetTextPage()->toPlainText(), false); -#endif - -#ifdef ADVANCE_SUPPORT - infoBoard->addOptionalAction("Shorten Ciphertext", [this]() { - if (settings.value("general/serviceToken").toString().isEmpty()) - QMessageBox::warning(nullptr, _("Service Token Empty"), - _("Please go to the settings interface to set " - "Own Key and get Service Token.")); - else { - shortenCryptText(); - } - }); -#endif } else { QMessageBox::critical(this, _("Error"), _("An error occurred during operation.")); diff --git a/src/ui/main_window/MainWindowUI.cpp b/src/ui/main_window/MainWindowUI.cpp index 01c4bbc9..fa5e6de3 100644 --- a/src/ui/main_window/MainWindowUI.cpp +++ b/src/ui/main_window/MainWindowUI.cpp @@ -28,10 +28,6 @@ #include "MainWindow.h" #include "ui/UserInterfaceUtils.h" -#ifdef SMTP_SUPPORT -#include "ui/mail/ReceiveMailDialog.h" -#include "ui/mail/SendMailDialog.h" -#endif namespace GpgFrontend::UI { @@ -314,23 +310,6 @@ void MainWindow::create_actions() { add_pgp_header_act_ = new QAction(_("Add PGP Header"), this); connect(add_pgp_header_act_, &QAction::triggered, this, &MainWindow::slot_add_pgp_header); - -#ifdef SMTP_SUPPORT - send_mail_act_ = new QAction(_("New Message"), this); - send_mail_act_->setIcon(QIcon(":email.png")); - connect(send_mail_act_, &QAction::triggered, this, [=]() { - auto* dialog = new SendMailDialog({}, this); - dialog->show(); - }); - - receive_mail_act_ = new QAction(_("Message Inbox"), this); - receive_mail_act_->setVisible(false); - receive_mail_act_->setIcon(QIcon(":receive_email.png")); - connect(receive_mail_act_, &QAction::triggered, this, [=]() { - auto* dialog = new ReceiveMailDialog(this); - dialog->show(); - }); -#endif } void MainWindow::create_menus() { @@ -387,11 +366,6 @@ void MainWindow::create_menus() { steganography_menu_ = menuBar()->addMenu(_("Steganography")); steganography_menu_->addAction(cut_pgp_header_act_); steganography_menu_->addAction(add_pgp_header_act_); -#ifdef SMTP_SUPPORT - email_menu_ = menuBar()->addMenu(_("Email")); - email_menu_->addAction(send_mail_act_); - email_menu_->addAction(receive_mail_act_); -#endif view_menu_ = menuBar()->addMenu(_("View")); @@ -442,12 +416,6 @@ void MainWindow::create_tool_bars() { special_edit_tool_bar_->hide(); view_menu_->addAction(special_edit_tool_bar_->toggleViewAction()); - email_tool_bar_ = addToolBar(_("Email")); - email_tool_bar_->setObjectName("emailToolBar"); - email_tool_bar_->addAction(send_mail_act_); - email_tool_bar_->addAction(receive_mail_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_); |