diff options
-rw-r--r-- | src/printsupport/CMakeLists.txt | 24 | ||||
-rw-r--r-- | src/printsupport/dialogs/images/printer-24.png (renamed from src/printsupport/dialogs/images/print-24.png) | bin | 914 -> 914 bytes | |||
-rw-r--r-- | src/printsupport/dialogs/images/printer-32.png (renamed from src/printsupport/dialogs/images/print-32.png) | bin | 1202 -> 1202 bytes | |||
-rw-r--r-- | src/printsupport/dialogs/images/view-pages-facing-24.png (renamed from src/printsupport/dialogs/images/view-page-sided-24.png) | bin | 700 -> 700 bytes | |||
-rw-r--r-- | src/printsupport/dialogs/images/view-pages-facing-32.png (renamed from src/printsupport/dialogs/images/view-page-sided-32.png) | bin | 908 -> 908 bytes | |||
-rw-r--r-- | src/printsupport/dialogs/images/view-pages-overview-24.png (renamed from src/printsupport/dialogs/images/view-page-multi-24.png) | bin | 390 -> 390 bytes | |||
-rw-r--r-- | src/printsupport/dialogs/images/view-pages-overview-32.png (renamed from src/printsupport/dialogs/images/view-page-multi-32.png) | bin | 556 -> 556 bytes | |||
-rw-r--r-- | src/printsupport/dialogs/images/view-pages-single-24.png (renamed from src/printsupport/dialogs/images/view-page-one-24.png) | bin | 662 -> 662 bytes | |||
-rw-r--r-- | src/printsupport/dialogs/images/view-pages-single-32.png (renamed from src/printsupport/dialogs/images/view-page-one-32.png) | bin | 810 -> 810 bytes | |||
-rw-r--r-- | src/printsupport/dialogs/images/zoom-fit-page-24.png (renamed from src/printsupport/dialogs/images/fit-page-24.png) | bin | 985 -> 985 bytes | |||
-rw-r--r-- | src/printsupport/dialogs/images/zoom-fit-page-32.png (renamed from src/printsupport/dialogs/images/fit-page-32.png) | bin | 1330 -> 1330 bytes | |||
-rw-r--r-- | src/printsupport/dialogs/images/zoom-fit-width-24.png (renamed from src/printsupport/dialogs/images/fit-width-24.png) | bin | 706 -> 706 bytes | |||
-rw-r--r-- | src/printsupport/dialogs/images/zoom-fit-width-32.png (renamed from src/printsupport/dialogs/images/fit-width-32.png) | bin | 1004 -> 1004 bytes | |||
-rw-r--r-- | src/printsupport/dialogs/qprintdialog.qrc | 24 | ||||
-rw-r--r-- | src/printsupport/dialogs/qprintpreviewdialog.cpp | 14 |
15 files changed, 31 insertions, 31 deletions
diff --git a/src/printsupport/CMakeLists.txt b/src/printsupport/CMakeLists.txt index 2185c64b4b..02f9ed52e0 100644 --- a/src/printsupport/CMakeLists.txt +++ b/src/printsupport/CMakeLists.txt @@ -103,10 +103,10 @@ qt_internal_extend_target(PrintSupport CONDITION QT_FEATURE_printdialog if(QT_FEATURE_printdialog) # Resources: set(qprintdialog_resource_files - "dialogs/images/fit-page-24.png" - "dialogs/images/fit-page-32.png" - "dialogs/images/fit-width-24.png" - "dialogs/images/fit-width-32.png" + "dialogs/images/zoom-fit-page-24.png" + "dialogs/images/zoom-fit-page-32.png" + "dialogs/images/zoom-fit-width-24.png" + "dialogs/images/zoom-fit-width-32.png" "dialogs/images/go-first-24.png" "dialogs/images/go-first-32.png" "dialogs/images/go-last-24.png" @@ -121,14 +121,14 @@ if(QT_FEATURE_printdialog) "dialogs/images/layout-portrait-32.png" "dialogs/images/page-setup-24.png" "dialogs/images/page-setup-32.png" - "dialogs/images/print-24.png" - "dialogs/images/print-32.png" - "dialogs/images/view-page-multi-24.png" - "dialogs/images/view-page-multi-32.png" - "dialogs/images/view-page-one-24.png" - "dialogs/images/view-page-one-32.png" - "dialogs/images/view-page-sided-24.png" - "dialogs/images/view-page-sided-32.png" + "dialogs/images/printer-24.png" + "dialogs/images/printer-32.png" + "dialogs/images/view-pages-overview-24.png" + "dialogs/images/view-pages-overview-32.png" + "dialogs/images/view-pages-single-24.png" + "dialogs/images/view-pages-single-32.png" + "dialogs/images/view-pages-facing-24.png" + "dialogs/images/view-pages-facing-32.png" "dialogs/images/zoom-in-24.png" "dialogs/images/zoom-in-32.png" "dialogs/images/zoom-out-24.png" diff --git a/src/printsupport/dialogs/images/print-24.png b/src/printsupport/dialogs/images/printer-24.png Binary files differindex c6bf3e8672..c6bf3e8672 100644 --- a/src/printsupport/dialogs/images/print-24.png +++ b/src/printsupport/dialogs/images/printer-24.png diff --git a/src/printsupport/dialogs/images/print-32.png b/src/printsupport/dialogs/images/printer-32.png Binary files differindex 5830888653..5830888653 100644 --- a/src/printsupport/dialogs/images/print-32.png +++ b/src/printsupport/dialogs/images/printer-32.png diff --git a/src/printsupport/dialogs/images/view-page-sided-24.png b/src/printsupport/dialogs/images/view-pages-facing-24.png Binary files differindex 2131305c41..2131305c41 100644 --- a/src/printsupport/dialogs/images/view-page-sided-24.png +++ b/src/printsupport/dialogs/images/view-pages-facing-24.png diff --git a/src/printsupport/dialogs/images/view-page-sided-32.png b/src/printsupport/dialogs/images/view-pages-facing-32.png Binary files differindex e4d63f9992..e4d63f9992 100644 --- a/src/printsupport/dialogs/images/view-page-sided-32.png +++ b/src/printsupport/dialogs/images/view-pages-facing-32.png diff --git a/src/printsupport/dialogs/images/view-page-multi-24.png b/src/printsupport/dialogs/images/view-pages-overview-24.png Binary files differindex 87241472ae..87241472ae 100644 --- a/src/printsupport/dialogs/images/view-page-multi-24.png +++ b/src/printsupport/dialogs/images/view-pages-overview-24.png diff --git a/src/printsupport/dialogs/images/view-page-multi-32.png b/src/printsupport/dialogs/images/view-pages-overview-32.png Binary files differindex 130885a041..130885a041 100644 --- a/src/printsupport/dialogs/images/view-page-multi-32.png +++ b/src/printsupport/dialogs/images/view-pages-overview-32.png diff --git a/src/printsupport/dialogs/images/view-page-one-24.png b/src/printsupport/dialogs/images/view-pages-single-24.png Binary files differindex 4c6457b892..4c6457b892 100644 --- a/src/printsupport/dialogs/images/view-page-one-24.png +++ b/src/printsupport/dialogs/images/view-pages-single-24.png diff --git a/src/printsupport/dialogs/images/view-page-one-32.png b/src/printsupport/dialogs/images/view-pages-single-32.png Binary files differindex 537193984e..537193984e 100644 --- a/src/printsupport/dialogs/images/view-page-one-32.png +++ b/src/printsupport/dialogs/images/view-pages-single-32.png diff --git a/src/printsupport/dialogs/images/fit-page-24.png b/src/printsupport/dialogs/images/zoom-fit-page-24.png Binary files differindex c7b39d8853..c7b39d8853 100644 --- a/src/printsupport/dialogs/images/fit-page-24.png +++ b/src/printsupport/dialogs/images/zoom-fit-page-24.png diff --git a/src/printsupport/dialogs/images/fit-page-32.png b/src/printsupport/dialogs/images/zoom-fit-page-32.png Binary files differindex 98bc12d3ed..98bc12d3ed 100644 --- a/src/printsupport/dialogs/images/fit-page-32.png +++ b/src/printsupport/dialogs/images/zoom-fit-page-32.png diff --git a/src/printsupport/dialogs/images/fit-width-24.png b/src/printsupport/dialogs/images/zoom-fit-width-24.png Binary files differindex a729ffda54..a729ffda54 100644 --- a/src/printsupport/dialogs/images/fit-width-24.png +++ b/src/printsupport/dialogs/images/zoom-fit-width-24.png diff --git a/src/printsupport/dialogs/images/fit-width-32.png b/src/printsupport/dialogs/images/zoom-fit-width-32.png Binary files differindex 470a8b45d0..470a8b45d0 100644 --- a/src/printsupport/dialogs/images/fit-width-32.png +++ b/src/printsupport/dialogs/images/zoom-fit-width-32.png 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 @@ <!DOCTYPE RCC><RCC version="1.0"> <qresource prefix="/qt-project.org/dialogs/qprintpreviewdialog"> -<file>images/fit-page-24.png</file> -<file>images/fit-page-32.png</file> -<file>images/fit-width-24.png</file> -<file>images/fit-width-32.png</file> +<file>images/zoom-fit-page-24.png</file> +<file>images/zoom-fit-page-32.png</file> +<file>images/zoom-fit-width-24.png</file> +<file>images/zoom-fit-width-32.png</file> <file>images/go-first-24.png</file> <file>images/go-first-32.png</file> <file>images/go-last-24.png</file> @@ -18,14 +18,14 @@ <file>images/layout-portrait-32.png</file> <file>images/page-setup-24.png</file> <file>images/page-setup-32.png</file> -<file>images/print-24.png</file> -<file>images/print-32.png</file> -<file>images/view-page-multi-24.png</file> -<file>images/view-page-multi-32.png</file> -<file>images/view-page-one-24.png</file> -<file>images/view-page-one-32.png</file> -<file>images/view-page-sided-24.png</file> -<file>images/view-page-sided-32.png</file> +<file>images/printer-24.png</file> +<file>images/printer-32.png</file> +<file>images/view-pages-overview-24.png</file> +<file>images/view-pages-overview-32.png</file> +<file>images/view-pages-single-24.png</file> +<file>images/view-pages-single-32.png</file> +<file>images/view-pages-facing-24.png</file> +<file>images/view-pages-facing-32.png</file> <file>images/zoom-in-24.png</file> <file>images/zoom-in-32.png</file> <file>images/zoom-out-24.png</file> 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())); |