From 67a00f77068d1e01c1d0c8b7963dae4c6289b019 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Fri, 28 May 2021 17:28:03 +0200 Subject: Use icon themes in QPrintPreviewDialog [if they exist] I've renamed a few of the qrc icons to the names most common icon themes use for similar actions (the action themselves are not part of the icon naming spec https://specifications.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html since it's not been updated in a while). Task-number: QTBUG-85879 Change-Id: I23bb300dbf4e953517516c97b8af118859aeb6fa Reviewed-by: Volker Hilsheimer --- src/printsupport/dialogs/images/fit-page-24.png | Bin 985 -> 0 bytes src/printsupport/dialogs/images/fit-page-32.png | Bin 1330 -> 0 bytes src/printsupport/dialogs/images/fit-width-24.png | Bin 706 -> 0 bytes src/printsupport/dialogs/images/fit-width-32.png | Bin 1004 -> 0 bytes src/printsupport/dialogs/images/print-24.png | Bin 914 -> 0 bytes src/printsupport/dialogs/images/print-32.png | Bin 1202 -> 0 bytes src/printsupport/dialogs/images/printer-24.png | Bin 0 -> 914 bytes src/printsupport/dialogs/images/printer-32.png | Bin 0 -> 1202 bytes .../dialogs/images/view-page-multi-24.png | Bin 390 -> 0 bytes .../dialogs/images/view-page-multi-32.png | Bin 556 -> 0 bytes .../dialogs/images/view-page-one-24.png | Bin 662 -> 0 bytes .../dialogs/images/view-page-one-32.png | Bin 810 -> 0 bytes .../dialogs/images/view-page-sided-24.png | Bin 700 -> 0 bytes .../dialogs/images/view-page-sided-32.png | Bin 908 -> 0 bytes .../dialogs/images/view-pages-facing-24.png | Bin 0 -> 700 bytes .../dialogs/images/view-pages-facing-32.png | Bin 0 -> 908 bytes .../dialogs/images/view-pages-overview-24.png | Bin 0 -> 390 bytes .../dialogs/images/view-pages-overview-32.png | Bin 0 -> 556 bytes .../dialogs/images/view-pages-single-24.png | Bin 0 -> 662 bytes .../dialogs/images/view-pages-single-32.png | Bin 0 -> 810 bytes .../dialogs/images/zoom-fit-page-24.png | Bin 0 -> 985 bytes .../dialogs/images/zoom-fit-page-32.png | Bin 0 -> 1330 bytes .../dialogs/images/zoom-fit-width-24.png | Bin 0 -> 706 bytes .../dialogs/images/zoom-fit-width-32.png | Bin 0 -> 1004 bytes src/printsupport/dialogs/qprintdialog.qrc | 24 ++++++++++----------- src/printsupport/dialogs/qprintpreviewdialog.cpp | 14 ++++++------ 26 files changed, 19 insertions(+), 19 deletions(-) delete mode 100644 src/printsupport/dialogs/images/fit-page-24.png delete mode 100644 src/printsupport/dialogs/images/fit-page-32.png delete mode 100644 src/printsupport/dialogs/images/fit-width-24.png delete mode 100644 src/printsupport/dialogs/images/fit-width-32.png delete mode 100644 src/printsupport/dialogs/images/print-24.png delete mode 100644 src/printsupport/dialogs/images/print-32.png create mode 100644 src/printsupport/dialogs/images/printer-24.png create mode 100644 src/printsupport/dialogs/images/printer-32.png delete mode 100644 src/printsupport/dialogs/images/view-page-multi-24.png delete mode 100644 src/printsupport/dialogs/images/view-page-multi-32.png delete mode 100644 src/printsupport/dialogs/images/view-page-one-24.png delete mode 100644 src/printsupport/dialogs/images/view-page-one-32.png delete mode 100644 src/printsupport/dialogs/images/view-page-sided-24.png delete mode 100644 src/printsupport/dialogs/images/view-page-sided-32.png create mode 100644 src/printsupport/dialogs/images/view-pages-facing-24.png create mode 100644 src/printsupport/dialogs/images/view-pages-facing-32.png create mode 100644 src/printsupport/dialogs/images/view-pages-overview-24.png create mode 100644 src/printsupport/dialogs/images/view-pages-overview-32.png create mode 100644 src/printsupport/dialogs/images/view-pages-single-24.png create mode 100644 src/printsupport/dialogs/images/view-pages-single-32.png create mode 100644 src/printsupport/dialogs/images/zoom-fit-page-24.png create mode 100644 src/printsupport/dialogs/images/zoom-fit-page-32.png create mode 100644 src/printsupport/dialogs/images/zoom-fit-width-24.png create mode 100644 src/printsupport/dialogs/images/zoom-fit-width-32.png (limited to 'src/printsupport/dialogs') diff --git a/src/printsupport/dialogs/images/fit-page-24.png b/src/printsupport/dialogs/images/fit-page-24.png deleted file mode 100644 index c7b39d8853..0000000000 Binary files a/src/printsupport/dialogs/images/fit-page-24.png and /dev/null differ diff --git a/src/printsupport/dialogs/images/fit-page-32.png b/src/printsupport/dialogs/images/fit-page-32.png deleted file mode 100644 index 98bc12d3ed..0000000000 Binary files a/src/printsupport/dialogs/images/fit-page-32.png and /dev/null differ diff --git a/src/printsupport/dialogs/images/fit-width-24.png b/src/printsupport/dialogs/images/fit-width-24.png deleted file mode 100644 index a729ffda54..0000000000 Binary files a/src/printsupport/dialogs/images/fit-width-24.png and /dev/null differ diff --git a/src/printsupport/dialogs/images/fit-width-32.png b/src/printsupport/dialogs/images/fit-width-32.png deleted file mode 100644 index 470a8b45d0..0000000000 Binary files a/src/printsupport/dialogs/images/fit-width-32.png and /dev/null differ diff --git a/src/printsupport/dialogs/images/print-24.png b/src/printsupport/dialogs/images/print-24.png deleted file mode 100644 index c6bf3e8672..0000000000 Binary files a/src/printsupport/dialogs/images/print-24.png and /dev/null differ diff --git a/src/printsupport/dialogs/images/print-32.png b/src/printsupport/dialogs/images/print-32.png deleted file mode 100644 index 5830888653..0000000000 Binary files a/src/printsupport/dialogs/images/print-32.png and /dev/null differ diff --git a/src/printsupport/dialogs/images/printer-24.png b/src/printsupport/dialogs/images/printer-24.png new file mode 100644 index 0000000000..c6bf3e8672 Binary files /dev/null and b/src/printsupport/dialogs/images/printer-24.png differ diff --git a/src/printsupport/dialogs/images/printer-32.png b/src/printsupport/dialogs/images/printer-32.png new file mode 100644 index 0000000000..5830888653 Binary files /dev/null and b/src/printsupport/dialogs/images/printer-32.png differ diff --git a/src/printsupport/dialogs/images/view-page-multi-24.png b/src/printsupport/dialogs/images/view-page-multi-24.png deleted file mode 100644 index 87241472ae..0000000000 Binary files a/src/printsupport/dialogs/images/view-page-multi-24.png and /dev/null differ diff --git a/src/printsupport/dialogs/images/view-page-multi-32.png b/src/printsupport/dialogs/images/view-page-multi-32.png deleted file mode 100644 index 130885a041..0000000000 Binary files a/src/printsupport/dialogs/images/view-page-multi-32.png and /dev/null differ diff --git a/src/printsupport/dialogs/images/view-page-one-24.png b/src/printsupport/dialogs/images/view-page-one-24.png deleted file mode 100644 index 4c6457b892..0000000000 Binary files a/src/printsupport/dialogs/images/view-page-one-24.png and /dev/null differ diff --git a/src/printsupport/dialogs/images/view-page-one-32.png b/src/printsupport/dialogs/images/view-page-one-32.png deleted file mode 100644 index 537193984e..0000000000 Binary files a/src/printsupport/dialogs/images/view-page-one-32.png and /dev/null differ diff --git a/src/printsupport/dialogs/images/view-page-sided-24.png b/src/printsupport/dialogs/images/view-page-sided-24.png deleted file mode 100644 index 2131305c41..0000000000 Binary files a/src/printsupport/dialogs/images/view-page-sided-24.png and /dev/null differ diff --git a/src/printsupport/dialogs/images/view-page-sided-32.png b/src/printsupport/dialogs/images/view-page-sided-32.png deleted file mode 100644 index e4d63f9992..0000000000 Binary files a/src/printsupport/dialogs/images/view-page-sided-32.png and /dev/null differ diff --git a/src/printsupport/dialogs/images/view-pages-facing-24.png b/src/printsupport/dialogs/images/view-pages-facing-24.png new file mode 100644 index 0000000000..2131305c41 Binary files /dev/null and b/src/printsupport/dialogs/images/view-pages-facing-24.png differ diff --git a/src/printsupport/dialogs/images/view-pages-facing-32.png b/src/printsupport/dialogs/images/view-pages-facing-32.png new file mode 100644 index 0000000000..e4d63f9992 Binary files /dev/null and b/src/printsupport/dialogs/images/view-pages-facing-32.png differ diff --git a/src/printsupport/dialogs/images/view-pages-overview-24.png b/src/printsupport/dialogs/images/view-pages-overview-24.png new file mode 100644 index 0000000000..87241472ae Binary files /dev/null and b/src/printsupport/dialogs/images/view-pages-overview-24.png differ diff --git a/src/printsupport/dialogs/images/view-pages-overview-32.png b/src/printsupport/dialogs/images/view-pages-overview-32.png new file mode 100644 index 0000000000..130885a041 Binary files /dev/null and b/src/printsupport/dialogs/images/view-pages-overview-32.png differ diff --git a/src/printsupport/dialogs/images/view-pages-single-24.png b/src/printsupport/dialogs/images/view-pages-single-24.png new file mode 100644 index 0000000000..4c6457b892 Binary files /dev/null and b/src/printsupport/dialogs/images/view-pages-single-24.png differ diff --git a/src/printsupport/dialogs/images/view-pages-single-32.png b/src/printsupport/dialogs/images/view-pages-single-32.png new file mode 100644 index 0000000000..537193984e Binary files /dev/null and b/src/printsupport/dialogs/images/view-pages-single-32.png differ diff --git a/src/printsupport/dialogs/images/zoom-fit-page-24.png b/src/printsupport/dialogs/images/zoom-fit-page-24.png new file mode 100644 index 0000000000..c7b39d8853 Binary files /dev/null and b/src/printsupport/dialogs/images/zoom-fit-page-24.png differ diff --git a/src/printsupport/dialogs/images/zoom-fit-page-32.png b/src/printsupport/dialogs/images/zoom-fit-page-32.png new file mode 100644 index 0000000000..98bc12d3ed Binary files /dev/null and b/src/printsupport/dialogs/images/zoom-fit-page-32.png differ diff --git a/src/printsupport/dialogs/images/zoom-fit-width-24.png b/src/printsupport/dialogs/images/zoom-fit-width-24.png new file mode 100644 index 0000000000..a729ffda54 Binary files /dev/null and b/src/printsupport/dialogs/images/zoom-fit-width-24.png differ diff --git a/src/printsupport/dialogs/images/zoom-fit-width-32.png b/src/printsupport/dialogs/images/zoom-fit-width-32.png new file mode 100644 index 0000000000..470a8b45d0 Binary files /dev/null and b/src/printsupport/dialogs/images/zoom-fit-width-32.png differ diff --git a/src/printsupport/dialogs/qprintdialog.qrc b/src/printsupport/dialogs/qprintdialog.qrc index 5a579baa55..10b8e1d341 100644 --- a/src/printsupport/dialogs/qprintdialog.qrc +++ b/src/printsupport/dialogs/qprintdialog.qrc @@ -1,9 +1,9 @@ -images/fit-page-24.png -images/fit-page-32.png -images/fit-width-24.png -images/fit-width-32.png +images/zoom-fit-page-24.png +images/zoom-fit-page-32.png +images/zoom-fit-width-24.png +images/zoom-fit-width-32.png images/go-first-24.png images/go-first-32.png images/go-last-24.png @@ -18,14 +18,14 @@ images/layout-portrait-32.png images/page-setup-24.png images/page-setup-32.png -images/print-24.png -images/print-32.png -images/view-page-multi-24.png -images/view-page-multi-32.png -images/view-page-one-24.png -images/view-page-one-32.png -images/view-page-sided-24.png -images/view-page-sided-32.png +images/printer-24.png +images/printer-32.png +images/view-pages-overview-24.png +images/view-pages-overview-32.png +images/view-pages-single-24.png +images/view-pages-single-32.png +images/view-pages-facing-24.png +images/view-pages-facing-32.png images/zoom-in-24.png images/zoom-in-32.png images/zoom-out-24.png diff --git a/src/printsupport/dialogs/qprintpreviewdialog.cpp b/src/printsupport/dialogs/qprintpreviewdialog.cpp index ad52dc2b91..44e5af5f76 100644 --- a/src/printsupport/dialogs/qprintpreviewdialog.cpp +++ b/src/printsupport/dialogs/qprintpreviewdialog.cpp @@ -353,7 +353,7 @@ void QPrintPreviewDialogPrivate::init(QPrinter *_printer) static inline void qt_setupActionIcon(QAction *action, QLatin1String name) { QLatin1String imagePrefix(":/qt-project.org/dialogs/qprintpreviewdialog/images/"); - QIcon icon; + QIcon icon = QIcon::fromTheme(name); icon.addFile(imagePrefix + name + QLatin1String("-24.png"), QSize(24, 24)); icon.addFile(imagePrefix + name + QLatin1String("-32.png"), QSize(32, 32)); action->setIcon(icon); @@ -384,8 +384,8 @@ void QPrintPreviewDialogPrivate::setupActions() fitPageAction->setObjectName(QLatin1String("fitPageAction")); fitWidthAction->setCheckable(true); fitPageAction->setCheckable(true); - qt_setupActionIcon(fitWidthAction, QLatin1String("fit-width")); - qt_setupActionIcon(fitPageAction, QLatin1String("fit-page")); + qt_setupActionIcon(fitWidthAction, QLatin1String("zoom-fit-width")); + qt_setupActionIcon(fitPageAction, QLatin1String("zoom-fit-page")); QObject::connect(fitGroup, SIGNAL(triggered(QAction*)), q, SLOT(_q_fit(QAction*))); // Zoom @@ -411,9 +411,9 @@ void QPrintPreviewDialogPrivate::setupActions() singleModeAction = modeGroup->addAction(QCoreApplication::translate("QPrintPreviewDialog", "Show single page")); facingModeAction = modeGroup->addAction(QCoreApplication::translate("QPrintPreviewDialog", "Show facing pages")); overviewModeAction = modeGroup->addAction(QCoreApplication::translate("QPrintPreviewDialog", "Show overview of all pages")); - qt_setupActionIcon(singleModeAction, QLatin1String("view-page-one")); - qt_setupActionIcon(facingModeAction, QLatin1String("view-page-sided")); - qt_setupActionIcon(overviewModeAction, QLatin1String("view-page-multi")); + qt_setupActionIcon(singleModeAction, QLatin1String("view-pages-single")); + qt_setupActionIcon(facingModeAction, QLatin1String("view-pages-facing")); + qt_setupActionIcon(overviewModeAction, QLatin1String("view-pages-overview")); singleModeAction->setObjectName(QLatin1String("singleModeAction")); facingModeAction->setObjectName(QLatin1String("facingModeAction")); overviewModeAction->setObjectName(QLatin1String("overviewModeAction")); @@ -427,7 +427,7 @@ void QPrintPreviewDialogPrivate::setupActions() printerGroup = new QActionGroup(q); printAction = printerGroup->addAction(QCoreApplication::translate("QPrintPreviewDialog", "Print")); pageSetupAction = printerGroup->addAction(QCoreApplication::translate("QPrintPreviewDialog", "Page setup")); - qt_setupActionIcon(printAction, QLatin1String("print")); + qt_setupActionIcon(printAction, QLatin1String("printer")); qt_setupActionIcon(pageSetupAction, QLatin1String("page-setup")); QObject::connect(printAction, SIGNAL(triggered(bool)), q, SLOT(_q_print())); QObject::connect(pageSetupAction, SIGNAL(triggered(bool)), q, SLOT(_q_pageSetup())); -- cgit v1.2.3