diff --git a/Pdf4QtDocPageOrganizer/aboutdialog.cpp b/Pdf4QtDocPageOrganizer/aboutdialog.cpp index 6fd0ee8..56a4f64 100644 --- a/Pdf4QtDocPageOrganizer/aboutdialog.cpp +++ b/Pdf4QtDocPageOrganizer/aboutdialog.cpp @@ -53,6 +53,7 @@ PDFAboutDialog::PDFAboutDialog(QWidget* parent) : } pdf::PDFWidgetUtils::scaleWidget(this, QSize(750, 600)); + pdf::PDFWidgetUtils::style(this); } PDFAboutDialog::~PDFAboutDialog() diff --git a/Pdf4QtDocPageOrganizer/assembleoutputsettingsdialog.cpp b/Pdf4QtDocPageOrganizer/assembleoutputsettingsdialog.cpp index 4fced52..fc3f63b 100644 --- a/Pdf4QtDocPageOrganizer/assembleoutputsettingsdialog.cpp +++ b/Pdf4QtDocPageOrganizer/assembleoutputsettingsdialog.cpp @@ -38,6 +38,7 @@ AssembleOutputSettingsDialog::AssembleOutputSettingsDialog(QString directory, QW ui->outlineModeComboBox->setCurrentIndex(ui->outlineModeComboBox->findData(int(pdf::PDFDocumentManipulator::OutlineMode::DocumentParts))); pdf::PDFWidgetUtils::scaleWidget(this, QSize(450, 150)); + pdf::PDFWidgetUtils::style(this); } AssembleOutputSettingsDialog::~AssembleOutputSettingsDialog() diff --git a/Pdf4QtDocPageOrganizer/mainwindow.cpp b/Pdf4QtDocPageOrganizer/mainwindow.cpp index 9381be5..c2c5cb2 100644 --- a/Pdf4QtDocPageOrganizer/mainwindow.cpp +++ b/Pdf4QtDocPageOrganizer/mainwindow.cpp @@ -547,7 +547,7 @@ void MainWindow::performOperation(Operation operation) break; case Operation::GetSource: - QDesktopServices::openUrl(QUrl("https://github.com/JakubMelka/PdfForQt")); + QDesktopServices::openUrl(QUrl("https://github.com/JakubMelka/PDF4QT")); break; case Operation::InsertEmptyPage: diff --git a/Pdf4QtDocPageOrganizer/selectbookmarkstoregroupdialog.cpp b/Pdf4QtDocPageOrganizer/selectbookmarkstoregroupdialog.cpp index 81af147..7a3c0ab 100644 --- a/Pdf4QtDocPageOrganizer/selectbookmarkstoregroupdialog.cpp +++ b/Pdf4QtDocPageOrganizer/selectbookmarkstoregroupdialog.cpp @@ -46,6 +46,7 @@ SelectBookmarksToRegroupDialog::SelectBookmarksToRegroupDialog(const pdf::PDFDoc QSize size = pdf::PDFWidgetUtils::scaleDPI(this, QSize(400, 600)); setMinimumSize(size); + pdf::PDFWidgetUtils::style(this); } SelectBookmarksToRegroupDialog::~SelectBookmarksToRegroupDialog() diff --git a/Pdf4QtLib/sources/pdfobjecteditorwidget.cpp b/Pdf4QtLib/sources/pdfobjecteditorwidget.cpp index f389ef0..1a58a72 100644 --- a/Pdf4QtLib/sources/pdfobjecteditorwidget.cpp +++ b/Pdf4QtLib/sources/pdfobjecteditorwidget.cpp @@ -998,6 +998,7 @@ PDFEditObjectDialog::PDFEditObjectDialog(EditObjectType type, QWidget* parent) : connect(m_buttonBox, &QDialogButtonBox::rejected, this, &PDFEditObjectDialog::reject); setMinimumSize(PDFWidgetUtils::scaleDPI(this, QSize(480, 320))); + pdf::PDFWidgetUtils::style(this); } void PDFEditObjectDialog::setObject(PDFObject object) diff --git a/Pdf4QtLib/sources/pdfrenderingerrorswidget.cpp b/Pdf4QtLib/sources/pdfrenderingerrorswidget.cpp index 418d328..69eb892 100644 --- a/Pdf4QtLib/sources/pdfrenderingerrorswidget.cpp +++ b/Pdf4QtLib/sources/pdfrenderingerrorswidget.cpp @@ -19,6 +19,8 @@ #include "pdfdrawwidget.h" #include "ui_pdfrenderingerrorswidget.h" +#include "pdfwidgetutils.h" + namespace pdf { @@ -96,6 +98,8 @@ PDFRenderingErrorsWidget::PDFRenderingErrorsWidget(QWidget* parent, PDFWidget* p { ui->renderErrorsTreeWidget->scrollToItem(scrollToItem, QAbstractItemView::EnsureVisible); } + + pdf::PDFWidgetUtils::style(this); } PDFRenderingErrorsWidget::~PDFRenderingErrorsWidget() diff --git a/Pdf4QtLib/sources/pdfselectpagesdialog.cpp b/Pdf4QtLib/sources/pdfselectpagesdialog.cpp index 49993ac..0acd6fb 100644 --- a/Pdf4QtLib/sources/pdfselectpagesdialog.cpp +++ b/Pdf4QtLib/sources/pdfselectpagesdialog.cpp @@ -64,6 +64,7 @@ PDFSelectPagesDialog::PDFSelectPagesDialog(QString windowTitle, setMinimumWidth(pdf::PDFWidgetUtils::scaleDPI_x(this, 400)); updateUi(); + pdf::PDFWidgetUtils::style(this); } PDFSelectPagesDialog::~PDFSelectPagesDialog() diff --git a/Pdf4QtLib/sources/pdfwidgetutils.cpp b/Pdf4QtLib/sources/pdfwidgetutils.cpp index 5f16553..0f96a15 100644 --- a/Pdf4QtLib/sources/pdfwidgetutils.cpp +++ b/Pdf4QtLib/sources/pdfwidgetutils.cpp @@ -17,6 +17,10 @@ #include "pdfwidgetutils.h" +#include +#include +#include + #ifdef Q_OS_MAC int qt_default_dpi_x() { return 72; } int qt_default_dpi_y() { return 72; } @@ -90,4 +94,32 @@ QSize PDFWidgetUtils::scaleDPI(const QPaintDevice* widget, QSize unscaledSize) return QSize(width, height); } +void PDFWidgetUtils::style(QWidget* widget) +{ + const int dialogMarginX = scaleDPI_x(widget, 12); + const int dialogMarginY = scaleDPI_y(widget, 12); + const int dialogSpacing = scaleDPI_y(widget, 12); + + const int groupBoxMarginX = scaleDPI_x(widget, 20); + const int groupBoxMarginY = scaleDPI_y(widget, 20); + const int groupBoxSpacing = scaleDPI_y(widget, 12); + + QList childWidgets = widget->findChildren(); + childWidgets.append(widget); + + for (QWidget* childWidget : childWidgets) + { + if (qobject_cast(childWidget)) + { + childWidget->layout()->setContentsMargins(groupBoxMarginX, groupBoxMarginY, groupBoxMarginX, groupBoxMarginY); + childWidget->layout()->setSpacing(groupBoxSpacing); + } + else if (qobject_cast(childWidget)) + { + childWidget->layout()->setContentsMargins(dialogMarginX, dialogMarginY, dialogMarginX, dialogMarginY); + childWidget->layout()->setSpacing(dialogSpacing); + } + } +} + } // namespace pdf diff --git a/Pdf4QtLib/sources/pdfwidgetutils.h b/Pdf4QtLib/sources/pdfwidgetutils.h index 4274823..aec89b7 100644 --- a/Pdf4QtLib/sources/pdfwidgetutils.h +++ b/Pdf4QtLib/sources/pdfwidgetutils.h @@ -54,6 +54,9 @@ public: /// \param device Paint device to obtain logical DPI for scaling /// \param unscaledSize Unscaled size static QSize scaleDPI(const QPaintDevice* widget, QSize unscaledSize); + + /// Apply style to the widget + static void style(QWidget* widget); }; } // namespace pdf diff --git a/Pdf4QtViewer/pdfaboutdialog.cpp b/Pdf4QtViewer/pdfaboutdialog.cpp index 440eba3..d8eb736 100644 --- a/Pdf4QtViewer/pdfaboutdialog.cpp +++ b/Pdf4QtViewer/pdfaboutdialog.cpp @@ -53,6 +53,7 @@ PDFAboutDialog::PDFAboutDialog(QWidget* parent) : } pdf::PDFWidgetUtils::scaleWidget(this, QSize(750, 600)); + pdf::PDFWidgetUtils::style(this); } PDFAboutDialog::~PDFAboutDialog() diff --git a/Pdf4QtViewer/pdfdocumentpropertiesdialog.cpp b/Pdf4QtViewer/pdfdocumentpropertiesdialog.cpp index 54458b6..3bc2c65 100644 --- a/Pdf4QtViewer/pdfdocumentpropertiesdialog.cpp +++ b/Pdf4QtViewer/pdfdocumentpropertiesdialog.cpp @@ -55,6 +55,7 @@ PDFDocumentPropertiesDialog::PDFDocumentPropertiesDialog(const pdf::PDFDocument* } pdf::PDFWidgetUtils::scaleWidget(this, QSize(750, 600)); + pdf::PDFWidgetUtils::style(this); } PDFDocumentPropertiesDialog::~PDFDocumentPropertiesDialog() diff --git a/Pdf4QtViewer/pdfencryptionsettingsdialog.cpp b/Pdf4QtViewer/pdfencryptionsettingsdialog.cpp index 7b788d4..ead944a 100644 --- a/Pdf4QtViewer/pdfencryptionsettingsdialog.cpp +++ b/Pdf4QtViewer/pdfencryptionsettingsdialog.cpp @@ -19,6 +19,7 @@ #include "ui_pdfencryptionsettingsdialog.h" #include "pdfutils.h" +#include "pdfwidgetutils.h" #include "pdfsecurityhandler.h" #include @@ -73,6 +74,8 @@ PDFEncryptionSettingsDialog::PDFEncryptionSettingsDialog(QByteArray documentId, updateUi(); updatePasswordScore(); + + pdf::PDFWidgetUtils::style(this); } PDFEncryptionSettingsDialog::~PDFEncryptionSettingsDialog() diff --git a/Pdf4QtViewer/pdfoptimizedocumentdialog.cpp b/Pdf4QtViewer/pdfoptimizedocumentdialog.cpp index bbfc6cf..099d7e7 100644 --- a/Pdf4QtViewer/pdfoptimizedocumentdialog.cpp +++ b/Pdf4QtViewer/pdfoptimizedocumentdialog.cpp @@ -65,6 +65,7 @@ PDFOptimizeDocumentDialog::PDFOptimizeDocumentDialog(const pdf::PDFDocument* doc pdf::PDFWidgetUtils::scaleWidget(this, QSize(640, 380)); updateUi(); + pdf::PDFWidgetUtils::style(this); } PDFOptimizeDocumentDialog::~PDFOptimizeDocumentDialog() diff --git a/Pdf4QtViewer/pdfprogramcontroller.cpp b/Pdf4QtViewer/pdfprogramcontroller.cpp index ef09d08..e119a63 100644 --- a/Pdf4QtViewer/pdfprogramcontroller.cpp +++ b/Pdf4QtViewer/pdfprogramcontroller.cpp @@ -2149,7 +2149,7 @@ void PDFProgramController::onActionDeveloperCreateInstaller() void PDFProgramController::onActionGetSource() { - QDesktopServices::openUrl(QUrl("https://github.com/JakubMelka/PdfForQt")); + QDesktopServices::openUrl(QUrl("https://github.com/JakubMelka/PDF4QT")); } void PDFProgramController::onPageRenderingErrorsChanged(pdf::PDFInteger pageIndex, int errorsCount) diff --git a/Pdf4QtViewer/pdfrendertoimagesdialog.cpp b/Pdf4QtViewer/pdfrendertoimagesdialog.cpp index c4b713b..2182173 100644 --- a/Pdf4QtViewer/pdfrendertoimagesdialog.cpp +++ b/Pdf4QtViewer/pdfrendertoimagesdialog.cpp @@ -82,6 +82,7 @@ PDFRenderToImagesDialog::PDFRenderToImagesDialog(const pdf::PDFDocument* documen loadImageExportSettings(); pdf::PDFWidgetUtils::scaleWidget(this, QSize(1000, 600)); + pdf::PDFWidgetUtils::style(this); } PDFRenderToImagesDialog::~PDFRenderToImagesDialog() diff --git a/Pdf4QtViewer/pdfviewersettingsdialog.cpp b/Pdf4QtViewer/pdfviewersettingsdialog.cpp index 6ed6515..ac56d56 100644 --- a/Pdf4QtViewer/pdfviewersettingsdialog.cpp +++ b/Pdf4QtViewer/pdfviewersettingsdialog.cpp @@ -193,6 +193,7 @@ PDFViewerSettingsDialog::PDFViewerSettingsDialog(const PDFViewerSettings::Settin connect(ui->pluginsTableWidget, &QTableWidget::itemSelectionChanged, this, &PDFViewerSettingsDialog::updatePluginInformation); setMinimumSize(pdf::PDFWidgetUtils::scaleDPI(this, QSize(1000, 700))); + pdf::PDFWidgetUtils::style(this); ui->optionsPagesWidget->setCurrentRow(0); adjustSize(); diff --git a/Pdf4QtViewerPlugins/DimensionsPlugin/settingsdialog.cpp b/Pdf4QtViewerPlugins/DimensionsPlugin/settingsdialog.cpp index b2b03c9..ca7c54c 100644 --- a/Pdf4QtViewerPlugins/DimensionsPlugin/settingsdialog.cpp +++ b/Pdf4QtViewerPlugins/DimensionsPlugin/settingsdialog.cpp @@ -38,6 +38,7 @@ SettingsDialog::SettingsDialog(QWidget* parent, DimensionUnit& lengthUnit, Dimen initComboBox(m_angleUnits, m_angleUnit, ui->anglesComboBox); setMinimumSize(pdf::PDFWidgetUtils::scaleDPI(this, QSize(320, 160))); + pdf::PDFWidgetUtils::style(this); } SettingsDialog::~SettingsDialog() diff --git a/Pdf4QtViewerPlugins/ObjectInspectorPlugin/objectinspectordialog.cpp b/Pdf4QtViewerPlugins/ObjectInspectorPlugin/objectinspectordialog.cpp index 20e5932..b039773 100644 --- a/Pdf4QtViewerPlugins/ObjectInspectorPlugin/objectinspectordialog.cpp +++ b/Pdf4QtViewerPlugins/ObjectInspectorPlugin/objectinspectordialog.cpp @@ -108,6 +108,7 @@ ObjectInspectorDialog::ObjectInspectorDialog(const pdf::PDFCMS* cms, const pdf:: ui->objectTreeView->setMinimumWidth(pdf::PDFWidgetUtils::scaleDPI_x(this, 200)); setMinimumSize(pdf::PDFWidgetUtils::scaleDPI(this, QSize(800, 600))); + pdf::PDFWidgetUtils::style(this); } ObjectInspectorDialog::~ObjectInspectorDialog() diff --git a/Pdf4QtViewerPlugins/ObjectInspectorPlugin/objectstatisticsdialog.cpp b/Pdf4QtViewerPlugins/ObjectInspectorPlugin/objectstatisticsdialog.cpp index e06551a..77b72fa 100644 --- a/Pdf4QtViewerPlugins/ObjectInspectorPlugin/objectstatisticsdialog.cpp +++ b/Pdf4QtViewerPlugins/ObjectInspectorPlugin/objectstatisticsdialog.cpp @@ -18,6 +18,8 @@ #include "objectstatisticsdialog.h" #include "ui_objectstatisticsdialog.h" +#include "pdfwidgetutils.h" + namespace pdfplugin { @@ -38,6 +40,7 @@ ObjectStatisticsDialog::ObjectStatisticsDialog(const pdf::PDFDocument* document, m_statistics = classifier.calculateStatistics(document); updateStatisticsWidget(); + pdf::PDFWidgetUtils::style(this); } ObjectStatisticsDialog::~ObjectStatisticsDialog() diff --git a/Pdf4QtViewerPlugins/OutputPreviewPlugin/inkcoveragedialog.cpp b/Pdf4QtViewerPlugins/OutputPreviewPlugin/inkcoveragedialog.cpp index ea1169c..d926f9d 100644 --- a/Pdf4QtViewerPlugins/OutputPreviewPlugin/inkcoveragedialog.cpp +++ b/Pdf4QtViewerPlugins/OutputPreviewPlugin/inkcoveragedialog.cpp @@ -46,6 +46,7 @@ InkCoverageDialog::InkCoverageDialog(const pdf::PDFDocument* document, pdf::PDFW setMinimumSize(pdf::PDFWidgetUtils::scaleDPI(this, QSize(800, 600))); updateInkCoverage(); + pdf::PDFWidgetUtils::style(this); } InkCoverageDialog::~InkCoverageDialog() diff --git a/Pdf4QtViewerPlugins/OutputPreviewPlugin/outputpreviewdialog.cpp b/Pdf4QtViewerPlugins/OutputPreviewPlugin/outputpreviewdialog.cpp index 1119b2b..2d93f4a 100644 --- a/Pdf4QtViewerPlugins/OutputPreviewPlugin/outputpreviewdialog.cpp +++ b/Pdf4QtViewerPlugins/OutputPreviewPlugin/outputpreviewdialog.cpp @@ -82,6 +82,7 @@ OutputPreviewDialog::OutputPreviewDialog(const pdf::PDFDocument* document, pdf:: onDisplayModeChanged(); onInkCoverageLimitChanged(ui->inkCoverageLimitEdit->value()); onRichBlackLimtiChanged(ui->richBlackLimitEdit->value()); + pdf::PDFWidgetUtils::style(this); } OutputPreviewDialog::~OutputPreviewDialog() diff --git a/Pdf4QtViewerPlugins/RedactPlugin/createredacteddocumentdialog.cpp b/Pdf4QtViewerPlugins/RedactPlugin/createredacteddocumentdialog.cpp index 4897568..1135617 100644 --- a/Pdf4QtViewerPlugins/RedactPlugin/createredacteddocumentdialog.cpp +++ b/Pdf4QtViewerPlugins/RedactPlugin/createredacteddocumentdialog.cpp @@ -38,6 +38,7 @@ CreateRedactedDocumentDialog::CreateRedactedDocumentDialog(QString fileName, QCo updateUi(); setMinimumWidth(pdf::PDFWidgetUtils::scaleDPI_x(this, 300)); + pdf::PDFWidgetUtils::style(this); } CreateRedactedDocumentDialog::~CreateRedactedDocumentDialog() diff --git a/Pdf4QtViewerPlugins/SoftProofingPlugin/settingsdialog.cpp b/Pdf4QtViewerPlugins/SoftProofingPlugin/settingsdialog.cpp index 71eadad..011e6be 100644 --- a/Pdf4QtViewerPlugins/SoftProofingPlugin/settingsdialog.cpp +++ b/Pdf4QtViewerPlugins/SoftProofingPlugin/settingsdialog.cpp @@ -43,6 +43,7 @@ SettingsDialog::SettingsDialog(QWidget* parent, const pdf::PDFCMSSettings& setti ui->outOfGamutColorEdit->setText(m_settings.outOfGamutColor.name(QColor::HexRgb)); setMinimumSize(pdf::PDFWidgetUtils::scaleDPI(this, QSize(320, 160))); + pdf::PDFWidgetUtils::style(this); } SettingsDialog::~SettingsDialog()