From: Ivailo Monev Date: Mon, 13 Jun 2022 16:59:59 +0000 (+0300) Subject: use icons from the system icon theme in print preview widget X-Git-Tag: 4.12.0~529 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=224e7c85574c0686dc7169fab4aa9ca13eea1ae0;p=kde%2FKatie.git use icons from the system icon theme in print preview widget Signed-off-by: Ivailo Monev --- diff --git a/src/gui/dialogs/images/fit-page-24.png b/src/gui/dialogs/images/fit-page-24.png deleted file mode 100644 index c7b39d885..000000000 Binary files a/src/gui/dialogs/images/fit-page-24.png and /dev/null differ diff --git a/src/gui/dialogs/images/fit-page-32.png b/src/gui/dialogs/images/fit-page-32.png deleted file mode 100644 index 98bc12d3e..000000000 Binary files a/src/gui/dialogs/images/fit-page-32.png and /dev/null differ diff --git a/src/gui/dialogs/images/fit-width-24.png b/src/gui/dialogs/images/fit-width-24.png deleted file mode 100644 index a729ffda5..000000000 Binary files a/src/gui/dialogs/images/fit-width-24.png and /dev/null differ diff --git a/src/gui/dialogs/images/fit-width-32.png b/src/gui/dialogs/images/fit-width-32.png deleted file mode 100644 index 470a8b45d..000000000 Binary files a/src/gui/dialogs/images/fit-width-32.png and /dev/null differ diff --git a/src/gui/dialogs/images/go-first-24.png b/src/gui/dialogs/images/go-first-24.png deleted file mode 100644 index 55315ffa3..000000000 Binary files a/src/gui/dialogs/images/go-first-24.png and /dev/null differ diff --git a/src/gui/dialogs/images/go-first-32.png b/src/gui/dialogs/images/go-first-32.png deleted file mode 100644 index 0fe6f94b7..000000000 Binary files a/src/gui/dialogs/images/go-first-32.png and /dev/null differ diff --git a/src/gui/dialogs/images/go-last-24.png b/src/gui/dialogs/images/go-last-24.png deleted file mode 100644 index 81061b80f..000000000 Binary files a/src/gui/dialogs/images/go-last-24.png and /dev/null differ diff --git a/src/gui/dialogs/images/go-last-32.png b/src/gui/dialogs/images/go-last-32.png deleted file mode 100644 index 887506107..000000000 Binary files a/src/gui/dialogs/images/go-last-32.png and /dev/null differ diff --git a/src/gui/dialogs/images/go-next-24.png b/src/gui/dialogs/images/go-next-24.png deleted file mode 100644 index 9a55ef3d8..000000000 Binary files a/src/gui/dialogs/images/go-next-24.png and /dev/null differ diff --git a/src/gui/dialogs/images/go-next-32.png b/src/gui/dialogs/images/go-next-32.png deleted file mode 100644 index 6d98f50f4..000000000 Binary files a/src/gui/dialogs/images/go-next-32.png and /dev/null differ diff --git a/src/gui/dialogs/images/go-previous-24.png b/src/gui/dialogs/images/go-previous-24.png deleted file mode 100644 index 2ea769eb8..000000000 Binary files a/src/gui/dialogs/images/go-previous-24.png and /dev/null differ diff --git a/src/gui/dialogs/images/go-previous-32.png b/src/gui/dialogs/images/go-previous-32.png deleted file mode 100644 index 37ba0c4e8..000000000 Binary files a/src/gui/dialogs/images/go-previous-32.png and /dev/null differ diff --git a/src/gui/dialogs/images/print-24.png b/src/gui/dialogs/images/print-24.png deleted file mode 100644 index c6bf3e867..000000000 Binary files a/src/gui/dialogs/images/print-24.png and /dev/null differ diff --git a/src/gui/dialogs/images/print-32.png b/src/gui/dialogs/images/print-32.png deleted file mode 100644 index 583088865..000000000 Binary files a/src/gui/dialogs/images/print-32.png and /dev/null differ diff --git a/src/gui/dialogs/images/zoom-in-24.png b/src/gui/dialogs/images/zoom-in-24.png deleted file mode 100644 index 1e290c1b5..000000000 Binary files a/src/gui/dialogs/images/zoom-in-24.png and /dev/null differ diff --git a/src/gui/dialogs/images/zoom-in-32.png b/src/gui/dialogs/images/zoom-in-32.png deleted file mode 100644 index 2d1bf8d43..000000000 Binary files a/src/gui/dialogs/images/zoom-in-32.png and /dev/null differ diff --git a/src/gui/dialogs/images/zoom-out-24.png b/src/gui/dialogs/images/zoom-out-24.png deleted file mode 100644 index 19703474f..000000000 Binary files a/src/gui/dialogs/images/zoom-out-24.png and /dev/null differ diff --git a/src/gui/dialogs/images/zoom-out-32.png b/src/gui/dialogs/images/zoom-out-32.png deleted file mode 100644 index 8e64dcec5..000000000 Binary files a/src/gui/dialogs/images/zoom-out-32.png and /dev/null differ diff --git a/src/gui/dialogs/qprintdialog.qrc b/src/gui/dialogs/qprintdialog.qrc index f54eb6b5e..1c86cea61 100644 --- a/src/gui/dialogs/qprintdialog.qrc +++ b/src/gui/dialogs/qprintdialog.qrc @@ -1,35 +1,17 @@ -images/fit-page-24.png -images/fit-page-32.png -images/fit-width-24.png -images/fit-width-32.png -images/go-first-24.png -images/go-first-32.png -images/go-last-24.png -images/go-last-32.png -images/go-next-24.png -images/go-next-32.png -images/go-previous-24.png -images/go-previous-32.png images/layout-landscape-24.png images/layout-landscape-32.png images/layout-portrait-24.png 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/zoom-in-24.png -images/zoom-in-32.png -images/zoom-out-24.png -images/zoom-out-32.png images/status-color.png diff --git a/src/gui/dialogs/qprintpreviewdialog.cpp b/src/gui/dialogs/qprintpreviewdialog.cpp index e4ab550de..3136610b6 100644 --- a/src/gui/dialogs/qprintpreviewdialog.cpp +++ b/src/gui/dialogs/qprintpreviewdialog.cpp @@ -302,7 +302,7 @@ void QPrintPreviewDialogPrivate::init(QPrinter *_printer) preview->setFocus(); } -static inline void qt_setupActionIcon(QAction *action, const QLatin1String &name) +static inline void qt_setupActionIconResource(QAction *action, const QLatin1String &name) { QLatin1String imagePrefix(":/trolltech/dialogs/qprintpreviewdialog/images/"); QIcon icon; @@ -311,6 +311,11 @@ static inline void qt_setupActionIcon(QAction *action, const QLatin1String &name action->setIcon(icon); } +static inline void qt_setupActionIcon(QAction *action, const QLatin1String &name) +{ + action->setIcon(QIcon::fromTheme(name, QIcon(QLatin1String("unknown")))); +} + void QPrintPreviewDialogPrivate::setupActions() { Q_Q(QPrintPreviewDialog); @@ -336,8 +341,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-best")); QObject::connect(fitGroup, SIGNAL(triggered(QAction*)), q, SLOT(_q_fit(QAction*))); // Zoom @@ -353,8 +358,8 @@ void QPrintPreviewDialogPrivate::setupActions() landscapeAction = orientationGroup->addAction(QCoreApplication::translate("QPrintPreviewDialog", "Landscape")); portraitAction->setCheckable(true); landscapeAction->setCheckable(true); - qt_setupActionIcon(portraitAction, QLatin1String("layout-portrait")); - qt_setupActionIcon(landscapeAction, QLatin1String("layout-landscape")); + qt_setupActionIconResource(portraitAction, QLatin1String("layout-portrait")); + qt_setupActionIconResource(landscapeAction, QLatin1String("layout-landscape")); QObject::connect(portraitAction, SIGNAL(triggered(bool)), preview, SLOT(setPortraitOrientation())); QObject::connect(landscapeAction, SIGNAL(triggered(bool)), preview, SLOT(setLandscapeOrientation())); @@ -363,9 +368,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_setupActionIconResource(singleModeAction, QLatin1String("view-page-one")); + qt_setupActionIconResource(facingModeAction, QLatin1String("view-page-sided")); + qt_setupActionIconResource(overviewModeAction, QLatin1String("view-page-multi")); singleModeAction->setObjectName(QLatin1String("singleModeAction")); facingModeAction->setObjectName(QLatin1String("facingModeAction")); overviewModeAction->setObjectName(QLatin1String("overviewModeAction")); @@ -379,8 +384,8 @@ 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(pageSetupAction, QLatin1String("page-setup")); + qt_setupActionIcon(printAction, QLatin1String("document-print")); + qt_setupActionIconResource(pageSetupAction, QLatin1String("page-setup")); QObject::connect(printAction, SIGNAL(triggered(bool)), q, SLOT(_q_print())); QObject::connect(pageSetupAction, SIGNAL(triggered(bool)), q, SLOT(_q_pageSetup()));