diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-01-29 01:53:32 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-01-29 01:53:32 (GMT) |
| commit | 91a0da8d3674d832fde87c9c1bc5a4bdb959ac3d (patch) | |
| tree | ef09bd890041b3c44f7be3322321c96174e94054 /src/gui/dialogs/qprintpreviewdialog.cpp | |
| parent | 687d50f05a1a2d9355f0990e845967930c57b985 (diff) | |
| parent | fe129a59ab54e6c0194c546a02bc64e886c252d5 (diff) | |
| download | Qt-91a0da8d3674d832fde87c9c1bc5a4bdb959ac3d.zip Qt-91a0da8d3674d832fde87c9c1bc5a4bdb959ac3d.tar.gz Qt-91a0da8d3674d832fde87c9c1bc5a4bdb959ac3d.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/gui/dialogs/qprintpreviewdialog.cpp')
| -rw-r--r-- | src/gui/dialogs/qprintpreviewdialog.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/gui/dialogs/qprintpreviewdialog.cpp b/src/gui/dialogs/qprintpreviewdialog.cpp index 42be780..6723b53 100644 --- a/src/gui/dialogs/qprintpreviewdialog.cpp +++ b/src/gui/dialogs/qprintpreviewdialog.cpp @@ -207,6 +207,9 @@ public: QActionGroup *printerGroup; QAction *printAction; QAction *pageSetupAction; +#if defined(Q_WS_MAC) && !defined(QT_MAC_USE_COCOA) + QAction *closeAction; +#endif QPointer<QObject> receiverToDisconnectOnClose; QByteArray memberToDisconnectOnClose; @@ -287,6 +290,9 @@ void QPrintPreviewDialogPrivate::init(QPrinter *_printer) toolbar->addSeparator(); toolbar->addAction(pageSetupAction); toolbar->addAction(printAction); +#if defined(Q_WS_MAC) && !defined(QT_MAC_USE_COCOA) + toolbar->addAction(closeAction); +#endif // Cannot use the actions' triggered signal here, since it doesn't autorepeat QToolButton *zoomInButton = static_cast<QToolButton *>(toolbar->widgetForAction(zoomInAction)); @@ -406,6 +412,10 @@ void QPrintPreviewDialogPrivate::setupActions() 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())); +#if defined(Q_WS_MAC) && !defined(QT_MAC_USE_COCOA) + closeAction = printerGroup->addAction(QCoreApplication::translate("QPrintPreviewDialog", "Close")); + QObject::connect(closeAction, SIGNAL(triggered(bool)), q, SLOT(reject())); +#endif // Initial state: fitPageAction->setChecked(true); |