diff options
author | Saturneric <[email protected]> | 2021-12-16 11:08:16 +0000 |
---|---|---|
committer | Saturneric <[email protected]> | 2021-12-16 11:08:16 +0000 |
commit | e4f4eda6fe1e9012303798ab5e851fb829c68c37 (patch) | |
tree | a64c31577669c93e11b8932670d19d448d44d947 /src | |
parent | Added and Fixed Translation. (diff) | |
download | GpgFrontend-e4f4eda6fe1e9012303798ab5e851fb829c68c37.tar.gz GpgFrontend-e4f4eda6fe1e9012303798ab5e851fb829c68c37.zip |
Fixed Project Configure.
Diffstat (limited to 'src')
-rw-r--r-- | src/ui/MainWindow.h | 4 | ||||
-rw-r--r-- | src/ui/UserInterfaceUtils.cpp | 2 | ||||
-rw-r--r-- | src/ui/UserInterfaceUtils.h | 2 | ||||
-rw-r--r-- | src/ui/main_window/MainWindowUI.cpp | 5 | ||||
-rw-r--r-- | src/ui/settings/SettingsSendMail.cpp | 6 | ||||
-rw-r--r-- | src/ui/settings/SettingsSendMail.h | 2 |
6 files changed, 19 insertions, 2 deletions
diff --git a/src/ui/MainWindow.h b/src/ui/MainWindow.h index b8266e5a..68b062ce 100644 --- a/src/ui/MainWindow.h +++ b/src/ui/MainWindow.h @@ -322,7 +322,9 @@ class MainWindow : public QMainWindow { QMenu* keyMenu{}; /** Submenu for key-operations */ QMenu* viewMenu{}; /** Submenu for view operations */ QMenu* importKeyMenu{}; /** Sumenu for import operations */ +#ifdef SMTP_SUPPORT QMenu* emailMenu{}; /** Sumenu for email operations */ +#endif QMenu* steganoMenu{}; /** Submenu for steganographic operations*/ QToolBar* cryptToolBar{}; /** Toolbar holding crypt actions */ @@ -380,7 +382,9 @@ class MainWindow : public QMainWindow { QAction* cutPgpHeaderAct{}; /** Action for cutting the PGP header */ QAction* addPgpHeaderAct{}; /** Action for adding the PGP header */ +#ifdef SMTP_SUPPORT QAction* sendMailAct{}; /** Action for sending a email */ +#endif QAction* importKeyFromFileAct{}; QAction* importKeyFromClipboardAct{}; diff --git a/src/ui/UserInterfaceUtils.cpp b/src/ui/UserInterfaceUtils.cpp index fafc8c6b..bd756c51 100644 --- a/src/ui/UserInterfaceUtils.cpp +++ b/src/ui/UserInterfaceUtils.cpp @@ -39,6 +39,7 @@ namespace GpgFrontend::UI { std::unique_ptr<GpgFrontend::UI::CommonUtils> GpgFrontend::UI::CommonUtils::_instance = nullptr; +#ifdef SMTP_SUPPORT void send_an_email(QWidget* parent, InfoBoardWidget* info_board, const QString& text) { info_board->addOptionalAction(_("Send Encrypted Mail"), [=]() { @@ -59,6 +60,7 @@ void send_an_email(QWidget* parent, InfoBoardWidget* info_board, } }); } +#endif void show_verify_details(QWidget* parent, InfoBoardWidget* info_board, GpgError error, const GpgVerifyResult& verify_result) { diff --git a/src/ui/UserInterfaceUtils.h b/src/ui/UserInterfaceUtils.h index b730245f..a08f3420 100644 --- a/src/ui/UserInterfaceUtils.h +++ b/src/ui/UserInterfaceUtils.h @@ -38,8 +38,10 @@ namespace GpgFrontend::UI { class InfoBoardWidget; class TextEdit; +#ifdef SMTP_SUPPORT void send_an_email(QWidget* parent, InfoBoardWidget* info_board, const QString& text); +#endif void show_verify_details(QWidget* parent, InfoBoardWidget* info_board, GpgError error, const GpgVerifyResult& verify_result); diff --git a/src/ui/main_window/MainWindowUI.cpp b/src/ui/main_window/MainWindowUI.cpp index c33407f3..0c557d16 100644 --- a/src/ui/main_window/MainWindowUI.cpp +++ b/src/ui/main_window/MainWindowUI.cpp @@ -296,12 +296,14 @@ void MainWindow::createActions() { addPgpHeaderAct = new QAction(_("Add PGP Header"), this); connect(addPgpHeaderAct, SIGNAL(triggered()), this, SLOT(slotAddPgpHeader())); +#ifdef SMTP_SUPPORT sendMailAct = new QAction(_("Send An Email"), this); sendMailAct->setIcon(QIcon(":email.png")); connect(sendMailAct, &QAction::triggered, this, [=]() { auto* dialog = new SendMailDialog({}, this); dialog->show(); }); +#endif } void MainWindow::createMenus() { @@ -358,9 +360,10 @@ void MainWindow::createMenus() { steganoMenu = menuBar()->addMenu(_("Steganography")); steganoMenu->addAction(cutPgpHeaderAct); steganoMenu->addAction(addPgpHeaderAct); - +#ifdef SMTP_SUPPORT emailMenu = menuBar()->addMenu(_("Email")); emailMenu->addAction(sendMailAct); +#endif #ifdef ADVANCED_SUPPORT // Hide menu, when steganography menu is disabled in settings diff --git a/src/ui/settings/SettingsSendMail.cpp b/src/ui/settings/SettingsSendMail.cpp index f8278c0b..821bf978 100644 --- a/src/ui/settings/SettingsSendMail.cpp +++ b/src/ui/settings/SettingsSendMail.cpp @@ -49,11 +49,13 @@ SendMailTab::SendMailTab(QWidget* parent) ui->defaultSenderEmailEdit->setDisabled(state != Qt::Checked); ui->checkConnectionButton->setDisabled(state != Qt::Checked); }); - + +#ifdef SMTP_SUPPORT connect(ui->checkConnectionButton, &QPushButton::clicked, this, &SendMailTab::slotCheckConnection); connect(ui->senTestMailButton, &QPushButton::clicked, this, &SendMailTab::slotSendTestMail); +#endif connect(ui->identityCheckBox, &QCheckBox::stateChanged, this, [=](int state) { ui->usernameEdit->setDisabled(state != Qt::Checked); @@ -258,6 +260,7 @@ void SendMailTab::slotCheckConnection() { } #endif +#ifdef SMTP_SUPPORT void SendMailTab::slotSendTestMail() { if (ui->defaultSenderEmailEdit->text().isEmpty()) { QMessageBox::critical(this, _("Fail"), _("Given a default sender first")); @@ -322,5 +325,6 @@ void SendMailTab::slotSendTestMail() { this, _("Success"), _("Succeed in sending a test email to the SMTP Server")); } +#endif } // namespace GpgFrontend::UI diff --git a/src/ui/settings/SettingsSendMail.h b/src/ui/settings/SettingsSendMail.h index aac0cbdd..cc733f28 100644 --- a/src/ui/settings/SettingsSendMail.h +++ b/src/ui/settings/SettingsSendMail.h @@ -22,9 +22,11 @@ class SendMailTab : public QWidget { private slots: +#ifdef SMTP_SUPPORT void slotCheckConnection(); void slotSendTestMail(); +#endif private: std::shared_ptr<Ui_SendMailSettings> ui; |