use icons from the system icon theme in print preview widget

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/gui/dialogs/images/fit-page-24.png b/src/gui/dialogs/images/fit-page-24.png
deleted file mode 100644 (file)
index c7b39d8..0000000
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 (file)
index 98bc12d..0000000
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 (file)
index a729ffd..0000000
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 (file)
index 470a8b4..0000000
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 (file)
index 55315ff..0000000
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 (file)
index 0fe6f94..0000000
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 (file)
index 81061b8..0000000
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 (file)
index 8875061..0000000
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 (file)
index 9a55ef3..0000000
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 (file)
index 6d98f50..0000000
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 (file)
index 2ea769e..0000000
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 (file)
index 37ba0c4..0000000
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 (file)
index c6bf3e8..0000000
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 (file)
index 5830888..0000000
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 (file)
index 1e290c1..0000000
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 (file)
index 2d1bf8d..0000000
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 (file)
index 1970347..0000000
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 (file)
index 8e64dce..0000000
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 f54eb6b..1c86cea 100644 (file)
--- a/src/gui/dialogs/qprintdialog.qrc
+++ b/src/gui/dialogs/qprintdialog.qrc
@@ -1,35 +1,17 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource prefix="/trolltech/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/go-first-24.png</file>
-<file>images/go-first-32.png</file>
-<file>images/go-last-24.png</file>
-<file>images/go-last-32.png</file>
-<file>images/go-next-24.png</file>
-<file>images/go-next-32.png</file>
-<file>images/go-previous-24.png</file>
-<file>images/go-previous-32.png</file>
 <file>images/layout-landscape-24.png</file>
 <file>images/layout-landscape-32.png</file>
 <file>images/layout-portrait-24.png</file>
 <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/zoom-in-24.png</file>
-<file>images/zoom-in-32.png</file>
-<file>images/zoom-out-24.png</file>
-<file>images/zoom-out-32.png</file>
 </qresource>
 <qresource prefix="/trolltech/dialogs/qprintdialog">
 <file>images/status-color.png</file>

diff --git a/src/gui/dialogs/qprintpreviewdialog.cpp b/src/gui/dialogs/qprintpreviewdialog.cpp
index e4ab550..3136610 100644 (file)
--- 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()));