diff --git a/Pdf4QtViewer/pdf4qtviewer.qrc b/Pdf4QtViewer/pdf4qtviewer.qrc index 6f2a227..53a302b 100644 --- a/Pdf4QtViewer/pdf4qtviewer.qrc +++ b/Pdf4QtViewer/pdf4qtviewer.qrc @@ -90,5 +90,6 @@ resources/pce-same-height.svg resources/pce-same-size.svg resources/pce-same-width.svg + resources/certificate-manager.svg diff --git a/Pdf4QtViewer/pdfprogramcontroller.cpp b/Pdf4QtViewer/pdfprogramcontroller.cpp index bd80fc6..e15ff59 100644 --- a/Pdf4QtViewer/pdfprogramcontroller.cpp +++ b/Pdf4QtViewer/pdfprogramcontroller.cpp @@ -26,6 +26,7 @@ #include "pdfconstants.h" #include "pdfdocumentbuilder.h" #include "pdfdbgheap.h" +#include "pdfcertificatemanagerdialog.h" #include "pdfviewersettings.h" #include "pdfundoredomanager.h" @@ -494,6 +495,10 @@ void PDFProgramController::initialize(Features features, { connect(action, &QAction::triggered, this, &PDFProgramController::onActionOptionsTriggered); } + if (QAction* action = m_actionManager->getAction(PDFActionManager::CertificateManager)) + { + connect(action, &QAction::triggered, this, &PDFProgramController::onActionCertificateManagerTriggered); + } if (QAction* action = m_actionManager->getAction(PDFActionManager::Open)) { connect(action, &QAction::triggered, this, &PDFProgramController::onActionOpenTriggered); @@ -1921,6 +1926,12 @@ void PDFProgramController::onActionOptionsTriggered() } } +void PDFProgramController::onActionCertificateManagerTriggered() +{ + pdf::PDFCertificateManagerDialog dialog(getMainWindow()); + dialog.exec(); +} + void PDFProgramController::onDrawSpaceChanged() { m_mainWindowInterface->updateUI(false); diff --git a/Pdf4QtViewer/pdfprogramcontroller.h b/Pdf4QtViewer/pdfprogramcontroller.h index 80f9084..33350be 100644 --- a/Pdf4QtViewer/pdfprogramcontroller.h +++ b/Pdf4QtViewer/pdfprogramcontroller.h @@ -98,6 +98,7 @@ public: SaveAs, Properties, Options, + CertificateManager, GetSource, About, SendByMail, @@ -333,6 +334,7 @@ private: void onActionFirstPageOnRightSideTriggered(); void onActionFindTriggered(); void onActionOptionsTriggered(); + void onActionCertificateManagerTriggered(); void onActionOpenTriggered(); void onActionCloseTriggered(); void onActionDeveloperCreateInstaller(); diff --git a/Pdf4QtViewer/pdfviewermainwindow.cpp b/Pdf4QtViewer/pdfviewermainwindow.cpp index 2a63550..af6039b 100644 --- a/Pdf4QtViewer/pdfviewermainwindow.cpp +++ b/Pdf4QtViewer/pdfviewermainwindow.cpp @@ -164,6 +164,7 @@ PDFViewerMainWindow::PDFViewerMainWindow(QWidget* parent) : m_actionManager->setAction(PDFActionManager::RenderOptionShowTextLines, ui->actionShow_Text_Lines); m_actionManager->setAction(PDFActionManager::Properties, ui->actionProperties); m_actionManager->setAction(PDFActionManager::Options, ui->actionOptions); + m_actionManager->setAction(PDFActionManager::CertificateManager, ui->actionCertificateManager); m_actionManager->setAction(PDFActionManager::GetSource, ui->actionGetSource); m_actionManager->setAction(PDFActionManager::About, ui->actionAbout); m_actionManager->setAction(PDFActionManager::SendByMail, ui->actionSend_by_E_Mail); diff --git a/Pdf4QtViewer/pdfviewermainwindow.ui b/Pdf4QtViewer/pdfviewermainwindow.ui index 4bf6635..ef2c152 100644 --- a/Pdf4QtViewer/pdfviewermainwindow.ui +++ b/Pdf4QtViewer/pdfviewermainwindow.ui @@ -103,6 +103,7 @@ + @@ -893,6 +894,15 @@ Encryption... + + + + :/resources/certificate-manager.svg:/resources/certificate-manager.svg + + + Certificates... + + diff --git a/Pdf4QtViewer/pdfviewermainwindowlite.cpp b/Pdf4QtViewer/pdfviewermainwindowlite.cpp index fb1638c..3ced1ce 100644 --- a/Pdf4QtViewer/pdfviewermainwindowlite.cpp +++ b/Pdf4QtViewer/pdfviewermainwindowlite.cpp @@ -132,6 +132,7 @@ PDFViewerMainWindowLite::PDFViewerMainWindowLite(QWidget* parent) : m_actionManager->setAction(PDFActionManager::RenderOptionInvertColors, ui->actionInvertColors); m_actionManager->setAction(PDFActionManager::Properties, ui->actionProperties); m_actionManager->setAction(PDFActionManager::Options, ui->actionOptions); + m_actionManager->setAction(PDFActionManager::CertificateManager, ui->actionCertificateManager); m_actionManager->setAction(PDFActionManager::GetSource, ui->actionGetSource); m_actionManager->setAction(PDFActionManager::About, ui->actionAbout); m_actionManager->setAction(PDFActionManager::SendByMail, ui->actionSend_by_E_Mail); diff --git a/Pdf4QtViewer/pdfviewermainwindowlite.ui b/Pdf4QtViewer/pdfviewermainwindowlite.ui index cc1ac52..a829e5e 100644 --- a/Pdf4QtViewer/pdfviewermainwindowlite.ui +++ b/Pdf4QtViewer/pdfviewermainwindowlite.ui @@ -97,6 +97,7 @@ + @@ -442,6 +443,15 @@ Get Source + + + + :/resources/certificate-manager.svg:/resources/certificate-manager.svg + + + Certificates... + + diff --git a/Pdf4QtViewer/resources/app-icon.ico b/Pdf4QtViewer/resources/app-icon.ico deleted file mode 100644 index 0feb0d8..0000000 Binary files a/Pdf4QtViewer/resources/app-icon.ico and /dev/null differ diff --git a/Pdf4QtViewer/resources/certificate-manager.svg b/Pdf4QtViewer/resources/certificate-manager.svg new file mode 100644 index 0000000..c534a8b --- /dev/null +++ b/Pdf4QtViewer/resources/certificate-manager.svg @@ -0,0 +1,80 @@ + + + + + + + + + + + + +