From c0cdcb28de507425202c8d14b81e9fedecb9bb83 Mon Sep 17 00:00:00 2001 From: Jakub Melka Date: Tue, 4 May 2021 18:40:51 +0200 Subject: [PATCH] Hide developer mode --- Pdf4QtViewer/pdfviewermainwindow.cpp | 7 +++ Pdf4QtViewer/pdfviewermainwindow.h | 2 + Pdf4QtViewer/pdfviewersettings.cpp | 3 + Pdf4QtViewer/pdfviewersettings.h | 1 + Pdf4QtViewer/pdfviewersettingsdialog.cpp | 5 ++ Pdf4QtViewer/pdfviewersettingsdialog.ui | 74 ++++++++++++++---------- 6 files changed, 62 insertions(+), 30 deletions(-) diff --git a/Pdf4QtViewer/pdfviewermainwindow.cpp b/Pdf4QtViewer/pdfviewermainwindow.cpp index f0f409a..4839488 100644 --- a/Pdf4QtViewer/pdfviewermainwindow.cpp +++ b/Pdf4QtViewer/pdfviewermainwindow.cpp @@ -282,6 +282,7 @@ PDFViewerMainWindow::PDFViewerMainWindow(QWidget* parent) : connect(m_progress, &pdf::PDFProgress::progressFinished, this, &PDFViewerMainWindow::onProgressFinished); m_programController->finishInitialization(); + updateDeveloperMenu(); if (pdf::PDFToolManager* toolManager = m_programController->getToolManager()) { @@ -384,6 +385,12 @@ void PDFViewerMainWindow::onProgressFinished() m_programController->updateActionsAvailability(); } +void PDFViewerMainWindow::updateDeveloperMenu() +{ + bool isDeveloperMode = m_programController->getSettings()->getSettings().m_allowDeveloperMode; + ui->menuDeveloper->menuAction()->setVisible(isDeveloperMode); +} + void PDFViewerMainWindow::updateUI(bool fullUpdate) { pdf::PDFTemporaryValueChange guard(&m_isLoadingUI, true); diff --git a/Pdf4QtViewer/pdfviewermainwindow.h b/Pdf4QtViewer/pdfviewermainwindow.h index f2deac3..bb3607c 100644 --- a/Pdf4QtViewer/pdfviewermainwindow.h +++ b/Pdf4QtViewer/pdfviewermainwindow.h @@ -101,6 +101,8 @@ private: void onProgressStep(int percentage); void onProgressFinished(); + void updateDeveloperMenu(); + QIcon createStickyNoteIcon(QString key) const; Ui::PDFViewerMainWindow* ui; diff --git a/Pdf4QtViewer/pdfviewersettings.cpp b/Pdf4QtViewer/pdfviewersettings.cpp index 32d852f..1d8f827 100644 --- a/Pdf4QtViewer/pdfviewersettings.cpp +++ b/Pdf4QtViewer/pdfviewersettings.cpp @@ -53,6 +53,7 @@ void PDFViewerSettings::readSettings(QSettings& settings, const pdf::PDFCMSSetti m_settings.m_instancedFontCacheLimit = settings.value("instancedFontCacheLimit", defaultSettings.m_instancedFontCacheLimit).toInt(); m_settings.m_allowLaunchApplications = settings.value("allowLaunchApplications", defaultSettings.m_allowLaunchApplications).toBool(); m_settings.m_allowLaunchURI = settings.value("allowLaunchURI", defaultSettings.m_allowLaunchURI).toBool(); + m_settings.m_allowDeveloperMode = settings.value("allowDeveloperMode", defaultSettings.m_allowDeveloperMode).toBool(); m_settings.m_multithreadingStrategy = static_cast(settings.value("multithreadingStrategy", static_cast(defaultSettings.m_multithreadingStrategy)).toInt()); m_settings.m_magnifierSize = settings.value("magnifierSize", defaultSettings.m_magnifierSize).toInt(); m_settings.m_magnifierZoom = settings.value("magnifierZoom", defaultSettings.m_magnifierZoom).toDouble(); @@ -118,6 +119,7 @@ void PDFViewerSettings::writeSettings(QSettings& settings) settings.setValue("instancedFontCacheLimit", m_settings.m_instancedFontCacheLimit); settings.setValue("allowLaunchApplications", m_settings.m_allowLaunchApplications); settings.setValue("allowLaunchURI", m_settings.m_allowLaunchURI); + settings.setValue("allowDeveloperMode", m_settings.m_allowDeveloperMode); settings.setValue("multithreadingStrategy", static_cast(m_settings.m_multithreadingStrategy)); settings.setValue("magnifierSize", m_settings.m_magnifierSize); settings.setValue("magnifierZoom", m_settings.m_magnifierZoom); @@ -257,6 +259,7 @@ PDFViewerSettings::Settings::Settings() : m_colorTolerance(0.01), m_allowLaunchApplications(true), m_allowLaunchURI(true), + m_allowDeveloperMode(false), m_compiledPageCacheLimit(128 * 1024), m_thumbnailsCacheLimit(PIXMAP_CACHE_LIMIT), m_fontCacheLimit(pdf::DEFAULT_FONT_CACHE_LIMIT), diff --git a/Pdf4QtViewer/pdfviewersettings.h b/Pdf4QtViewer/pdfviewersettings.h index 02f111d..b580c02 100644 --- a/Pdf4QtViewer/pdfviewersettings.h +++ b/Pdf4QtViewer/pdfviewersettings.h @@ -57,6 +57,7 @@ public: pdf::PDFReal m_colorTolerance; bool m_allowLaunchApplications; bool m_allowLaunchURI; + bool m_allowDeveloperMode; pdf::PDFExecutionPolicy::Strategy m_multithreadingStrategy; // Cache settings diff --git a/Pdf4QtViewer/pdfviewersettingsdialog.cpp b/Pdf4QtViewer/pdfviewersettingsdialog.cpp index 16014f2..6033d39 100644 --- a/Pdf4QtViewer/pdfviewersettingsdialog.cpp +++ b/Pdf4QtViewer/pdfviewersettingsdialog.cpp @@ -294,6 +294,7 @@ void PDFViewerSettingsDialog::loadData() ui->magnifierZoomEdit->setValue(m_settings.m_magnifierZoom); ui->maximumUndoStepsEdit->setValue(m_settings.m_maximumUndoSteps); ui->maximumRedoStepsEdit->setValue(m_settings.m_maximumRedoSteps); + ui->developerModeCheckBox->setChecked(m_settings.m_allowDeveloperMode); // CMS ui->cmsTypeComboBox->setCurrentIndex(ui->cmsTypeComboBox->findData(int(m_cmsSettings.system))); @@ -440,6 +441,10 @@ void PDFViewerSettingsDialog::saveData() { m_settings.m_allowLaunchURI = ui->allowRunURICheckBox->isChecked(); } + else if (sender == ui->developerModeCheckBox) + { + m_settings.m_allowDeveloperMode = ui->developerModeCheckBox->isChecked(); + } else if (sender == ui->compiledPageCacheSizeEdit) { m_settings.m_compiledPageCacheLimit = ui->compiledPageCacheSizeEdit->value(); diff --git a/Pdf4QtViewer/pdfviewersettingsdialog.ui b/Pdf4QtViewer/pdfviewersettingsdialog.ui index d5fd900..e89feef 100644 --- a/Pdf4QtViewer/pdfviewersettingsdialog.ui +++ b/Pdf4QtViewer/pdfviewersettingsdialog.ui @@ -26,7 +26,7 @@ - 5 + 7 @@ -882,20 +882,31 @@ - - - - 1.000000000000000 - + + - 10.000000000000000 + 20 - - + + - Maximum undo steps + Maximum redo steps + + + + + + + Magnifier size + + + + + + + 20 @@ -912,9 +923,6 @@ - - - @@ -922,31 +930,37 @@ - - + + + + + - Magnifier size + Maximum undo steps - - + + + + 1.000000000000000 + + + 10.000000000000000 + + + + + - Maximum redo steps + Enable - - - - 20 - - - - - - - 20 + + + + Developer mode