Changeset 846 for trunk/src/gui/dialogs

trunk

Property svn:mergeinfo changed
/branches/vendor/nokia/qt/4.7.2 (added) merged: 845
/branches/vendor/nokia/qt/current merged: 844
/branches/vendor/nokia/qt/4.6.3 removed

trunk/src/gui/dialogs/dialogs.pri

-              r573
+              r846
 win32 {
+    HEADERS += dialogs/qwizard_win_p.h
+    HEADERS += dialogs/qwizard_win_p.h \
+               dialogs/qfiledialog_win_p.h
     SOURCES += dialogs/qdialogsbinarycompat_win.cpp \
                dialogs/qfiledialog_win.cpp \
 …
         dialogs/qprintpreviewdialog.cpp
+symbian:contains(QT_CONFIG, s60) {
+    LIBS += -lCommonDialogs
+    SOURCES += dialogs/qfiledialog_symbian.cpp \
+               dialogs/qcolordialog_symbian.cpp
+}
 FORMS += dialogs/qpagesetupwidget.ui
 RESOURCES += dialogs/qprintdialog.qrc
 RESOURCES += dialogs/qmessagebox.qrc
+# Compensate for lack of platform defines in Symbian3
+symbian: DEFINES += SYMBIAN_VERSION_$$upper($$replace(SYMBIAN_VERSION,\\.,_))

trunk/src/gui/dialogs/qabstractpagesetupdialog.cpp

r651	r846
1	1	/****************************************************************************
2	2	**
3		** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	3	** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
4	4	** All rights reserved.
5	5	** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qabstractpagesetupdialog.h

r651	r846
1	1	/****************************************************************************
2	2	**
3		** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	3	** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
4	4	** All rights reserved.
5	5	** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qabstractpagesetupdialog_p.h

r651	r846
1	1	/****************************************************************************
2	2	**
3		** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	3	** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
4	4	** All rights reserved.
5	5	** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qabstractprintdialog.cpp

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 …
     Use QPrintDialog to display a print dialog in your application.
+    In Symbian, there is no support for printing. Hence, this dialog should not
+    be used in Symbian.
     \sa QPrintDialog, QPrinter, {Printing with Qt}
 */
 …
     \value Selection Only the selection should be printed.
     \value PageRange The specified page range should be printed.
+    \value CurrentPage Only the currently visible page should be printed.
     \sa QPrinter::PrintRange
 …
     \value PrintSelection The print selection option is enabled.
     \value PrintPageRange The page range selection option is enabled.
+    \value PrintCollateCopies
+    \value PrintShowPageSize  Show the page size + margins page only if this is enabled.
+    \value PrintCollateCopies The collate copies option is enabled
+    \value PrintCurrentPage The print current page option is enabled
     This value is obsolete and does nothing since Qt 4.5:
 …
     This is no longer supported in Qt 4.5.  If you want to use sheets, use
     QPrintDialog::open() instead.
-    \value PrintShowPageSize  Show the page size + margins page only if this is enabled.
 */

trunk/src/gui/dialogs/qabstractprintdialog.h

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 …
         AllPages,
         Selection,
+        PageRange
+        PageRange,
+        CurrentPage
     };
 …
         PrintShowPageSize       = 0x0008,
         PrintCollateCopies      = 0x0010,
+        DontUseSheet            = 0x0020
+        DontUseSheet            = 0x0020,
+        PrintCurrentPage        = 0x0040
     };

trunk/src/gui/dialogs/qabstractprintdialog_p.h

r651	r846
1	1	/****************************************************************************
2	2	**
3		** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	3	** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
4	4	** All rights reserved.
5	5	** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qcolordialog.cpp

-              r769
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 …
 */
+/*
+    For Symbian color dialogs
+*/
+#ifdef Q_WS_S60
+extern QColor qtSymbianGetColor(const QColor &initial);
+#endif
 /*!
     \since 4.5
 …
     The \a options argument allows you to customize the dialog.
+    On Symbian, this static function will use the native color dialog and not a QColorDialog.
+    On Symbian the parameters \a title and \a parent has no relevance and the
+    \a options parameter is only used to define if the native color dialog is
+    used or not.
 */
 QColor QColorDialog::getColor(const QColor &initial, QWidget *parent, const QString &title,
                               ColorDialogOptions options)
+{
+#ifdef Q_WS_S60
+    if (!(options & DontUseNativeDialog))
+        return qtSymbianGetColor(initial);
+#endif
     QColorDialog dlg(parent);
     if (!title.isEmpty())
 …
     dialog is a child of \a parent. It returns an invalid (see
     QColor::isValid()) color if the user cancels the dialog.
+    On Symbian, this static function will use the native
+    color dialog and not a QColorDialog.
 */
 QColor QColorDialog::getColor(const QColor &initial, QWidget *parent)
+{
+#ifdef Q_WS_S60
+    return qtSymbianGetColor(initial);
+#endif
     return getColor(initial, parent, QString(), ColorDialogOptions(0));
+}

trunk/src/gui/dialogs/qcolordialog.h

r651	r846
1	1	/****************************************************************************
2	2	**
3		** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	3	** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
4	4	** All rights reserved.
5	5	** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qcolordialog_mac.mm

-              r769
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 …
 QT_USE_NAMESPACE
 @class QCocoaColorPanelDelegate;
 @interface QCocoaColorPanelDelegate : NSObject<NSWindowDelegate> {
+@class QT_MANGLE_NAMESPACE(QCocoaColorPanelDelegate);
+@interface QT_MANGLE_NAMESPACE(QCocoaColorPanelDelegate) : NSObject<NSWindowDelegate> {
     NSColorPanel *mColorPanel;
     NSView *mStolenContentView;
 …
 @end
 @implementation QCocoaColorPanelDelegate
+@implementation QT_MANGLE_NAMESPACE(QCocoaColorPanelDelegate)
 - (id)initWithColorPanel:(NSColorPanel *)panel
        stolenContentView:(NSView *)stolenContentView
 …
+        }
         delegate = [[QCocoaColorPanelDelegate alloc] initWithColorPanel:colorPanel
+        delegate = [[QT_MANGLE_NAMESPACE(QCocoaColorPanelDelegate) alloc] initWithColorPanel:colorPanel
             stolenContentView:stolenContentView
             okButton:okButton
             cancelButton:cancelButton
             priv:this];
         [colorPanel setDelegate:static_cast<QCocoaColorPanelDelegate *>(delegate)];
+        [colorPanel setDelegate:static_cast<QT_MANGLE_NAMESPACE(QCocoaColorPanelDelegate) *>(delegate)];
+    }
     [delegate setResultSet:false];
     setCocoaPanelColor(initial);
     [static_cast<QCocoaColorPanelDelegate *>(delegate) showColorPanel];
+    [static_cast<QT_MANGLE_NAMESPACE(QCocoaColorPanelDelegate) *>(delegate) showColorPanel];
+}
 void QColorDialogPrivate::closeCocoaColorPanel()
+{
     [static_cast<QCocoaColorPanelDelegate *>(delegate) onCancelClicked];
+    [static_cast<QT_MANGLE_NAMESPACE(QCocoaColorPanelDelegate) *>(delegate) onCancelClicked];
+}
 void QColorDialogPrivate::releaseCocoaColorPanelDelegate()
+{
     [static_cast<QCocoaColorPanelDelegate *>(delegate) release];
+    [static_cast<QT_MANGLE_NAMESPACE(QCocoaColorPanelDelegate) *>(delegate) release];
+}
 …
 void QColorDialogPrivate::_q_macRunNativeAppModalPanel()
+{
     [static_cast<QCocoaColorPanelDelegate *>(delegate) exec];
+    [static_cast<QT_MANGLE_NAMESPACE(QCocoaColorPanelDelegate) *>(delegate) exec];
+}
 …
+{
     QMacCocoaAutoReleasePool pool;
     QCocoaColorPanelDelegate *theDelegate = static_cast<QCocoaColorPanelDelegate *>(delegate);
+    QT_MANGLE_NAMESPACE(QCocoaColorPanelDelegate) *theDelegate = static_cast<QT_MANGLE_NAMESPACE(QCocoaColorPanelDelegate) *>(delegate);
     NSColor *nsColor;
     const QColor::Spec spec = color.spec();

trunk/src/gui/dialogs/qcolordialog_p.h

r651	r846
1	1	/****************************************************************************
2	2	**
3		** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	3	** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
4	4	** All rights reserved.
5	5	** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qdialog.cpp

-              r769
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 …
 #   include "qfiledialog.h"
 #   include "qfontdialog.h"
-#   include "qcolordialog.h"
 #   include "qwizard.h"
+#   include "private/qt_s60_p.h"
 #endif
 #if defined(Q_WS_S60)
 #include "private/qt_s60_p.h"
+#include <AknUtils.h>               // AknLayoutUtils
 #endif
 …
 QDialog::QDialog(QWidget *parent, Qt::WindowFlags f)
     : QWidget(*new QDialogPrivate, parent,
               f | QFlag((f & Qt::WindowType_Mask) == 0 ? Qt::Dialog : 0))
+              f | ((f & Qt::WindowType_Mask) == 0 ? Qt::Dialog : Qt::WindowType(0)))
+{
 #ifdef Q_WS_WINCE
 …
     : QWidget(*new QDialogPrivate, parent,
+              f
               | QFlag(modal ? Qt::WShowModal : 0)
               | QFlag((f & Qt::WindowType_Mask) == 0 ? Qt::Dialog : 0)
+              | QFlag(modal ? Qt::WShowModal : Qt::WindowType(0))
+              | QFlag((f & Qt::WindowType_Mask) == 0 ? Qt::Dialog : Qt::WindowType(0))
+        )
+{
 …
 */
 QDialog::QDialog(QDialogPrivate &dd, QWidget *parent, Qt::WindowFlags f)
     : QWidget(dd, parent, f | QFlag((f & Qt::WindowType_Mask) == 0 ? Qt::Dialog : 0))
+    : QWidget(dd, parent, f | ((f & Qt::WindowType_Mask) == 0 ? Qt::Dialog : Qt::WindowType(0)))
+{
 #ifdef Q_WS_WINCE
 …
+}
 #if defined(Q_WS_WINCE) || defined(Q_WS_S60)
+#if defined(Q_WS_WINCE) || defined(Q_OS_SYMBIAN)
 #ifdef Q_WS_WINCE_WM
 void QDialogPrivate::_q_doneAction()
 …
         result = true;
+     }
 #else
+#elif defined(Q_WS_S60)
     if ((e->type() == QEvent::StyleChange) || (e->type() == QEvent::Resize )) {
         if (!testAttribute(Qt::WA_Moved)) {
 …
+        }
+    }
+    // TODO is Symbian, non-S60 behaviour required?
 #endif
     return result;
 …
 #endif //Q_WS_WINCE_WM
+    bool showSystemDialogFullScreen = false;
 #ifdef Q_OS_SYMBIAN
     if (qobject_cast<QFileDialog *>(this) || qobject_cast<QFontDialog *>(this) ||
         qobject_cast<QColorDialog *>(this) || qobject_cast<QWizard *>(this))
         showMaximized();
     else
+        qobject_cast<QWizard *>(this)) {
+        showSystemDialogFullScreen = true;
+    }
 #endif // Q_OS_SYMBIAN
+        show();
+    if (showSystemDialogFullScreen) {
+        setWindowFlags(windowFlags() | Qt::WindowSoftkeysVisibleHint);
+        setWindowState(Qt::WindowFullScreen);
+    }
+    show();
 #ifdef Q_WS_MAC
 …
         w = w->isWindow() ? 0 : w->parentWidget();
     if (w) {
         QMenu p(this);
         QAction *wt = p.addAction(tr("What's This?"));
         if (p.exec(e->globalPos()) == wt) {
+        QWeakPointer<QMenu> p = new QMenu(this);
+        QAction *wt = p.data()->addAction(tr("What's This?"));
+        if (p.data()->exec(e->globalPos()) == wt) {
             QHelpEvent e(QEvent::WhatsThis, w->rect().center(),
                          w->mapToGlobal(w->rect().center()));
             QApplication::sendEvent(w, &e);
+        }
+        delete p.data();
+    }
 #endif
 …
 #endif
 #ifdef Q_WS_S60
     if (s60AdjustedPosition())
+#ifdef Q_OS_SYMBIAN
+    if (symbianAdjustedPosition())
         //dialog has already been positioned
         return;
 …
+}
+#if defined(Q_OS_SYMBIAN)
+/*! \internal */
+bool QDialog::symbianAdjustedPosition()
+{
 #if defined(Q_WS_S60)
-/*! \internal */
-bool QDialog::s60AdjustedPosition()
+{
     QPoint p;
+    const QSize mainAreaSize = QApplication::desktop()->availableGeometry(QCursor::pos()).size();
+    const int statusPaneHeight = (S60->screenHeightInPixels - mainAreaSize.height())>>1;
+    const bool doS60Positioning = !(isFullScreen()||isMaximized());
+    if (doS60Positioning) {
+    QPoint oldPos = pos();
+    if (isFullScreen()) {
+        p.setX(0);
+        p.setY(0);
+    } else if (isMaximized()) {
+        TRect statusPaneRect = TRect();
+        if (S60->screenHeightInPixels > S60->screenWidthInPixels) {
+            AknLayoutUtils::LayoutMetricsRect(AknLayoutUtils::EStatusPane, statusPaneRect);
+        } else {
+            AknLayoutUtils::LayoutMetricsRect(AknLayoutUtils::EStaconTop, statusPaneRect);
+        }
+        p.setX(0);
+        p.setY(statusPaneRect.Height());
+    } else {
         // naive way to deduce screen orientation
         if (S60->screenHeightInPixels > S60->screenWidthInPixels) {
             int cbaHeight;
+            const CEikButtonGroupContainer* bgContainer = S60->buttonGroupContainer();
+            if (!bgContainer) {
+                cbaHeight = 0;
+            } else {
+                cbaHeight = qt_TSize2QSize(bgContainer->Size()).height();
+            }
+            TRect rect;
+            AknLayoutUtils::LayoutMetricsRect(AknLayoutUtils::EControlPane, rect);
+            cbaHeight = rect.Height();
             p.setY(S60->screenHeightInPixels - height() - cbaHeight);
             p.setX(0);
 …
+            }
+        }
+    }
+    if (oldPos != p || p.y() < 0)
         move(p);
+    }
+    return doS60Positioning;
+    return true;
+#else
+    // TODO - check positioning requirement for Symbian, non-s60
+    return false;
+#endif
+}
 #endif
 …
     if (minimumSize() != maximumSize()) {
         // In S60, dialogs are always the width of screen (in portrait, regardless of current layout)
         return QSize(qMax(S60->screenHeightInPixels, S60->screenWidthInPixels), QWidget::sizeHint().height());
+        return QSize(qMin(S60->screenHeightInPixels, S60->screenWidthInPixels), QWidget::sizeHint().height());
     } else {
         return QWidget::sizeHint();

trunk/src/gui/dialogs/qdialog.h

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 …
     QDialog(QDialogPrivate &, QWidget *parent, Qt::WindowFlags f = 0);
 #if defined(Q_WS_WINCE) || defined(Q_WS_S60)
+#if defined(Q_WS_WINCE) || defined(Q_OS_SYMBIAN)
     bool event(QEvent *e);
 #endif
 …
     Q_DISABLE_COPY(QDialog)
 #if defined(Q_WS_S60)
     bool s60AdjustedPosition();
+#if defined(Q_OS_SYMBIAN)
+    bool symbianAdjustedPosition();
 #endif

trunk/src/gui/dialogs/qdialog_p.h

r651	r846
1	1	/****************************************************************************
2	2	**
3		** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	3	** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
4	4	** All rights reserved.
5	5	** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qdialogsbinarycompat_win.cpp

r651	r846
1	1	/****************************************************************************
2	2	**
3		** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	3	** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
4	4	** All rights reserved.
5	5	** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qerrormessage.cpp

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 …
 #if defined(QT_SOFTKEYS_ENABLED)
 #include <qaction.h>
+#endif
 #ifdef Q_WS_S60
 #include "private/qt_s60_p.h"
-#endif
 #endif

trunk/src/gui/dialogs/qerrormessage.h

r651	r846
1	1	/****************************************************************************
2	2	**
3		** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	3	** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
4	4	** All rights reserved.
5	5	** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qfiledialog.cpp

-              r769
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 …
     \value ReadOnly Indicates that the model is readonly.
+    \value HideNameFilterDetails Indicates if the is hidden or not.
+    \value HideNameFilterDetails Indicates if the file name filter details are
+    hidden or not.
     \value DontUseSheet In previous versions of Qt, the static
 …
 #include <qshortcut.h>
 #ifdef Q_WS_MAC
-#include <private/qunicodetables_p.h>
 #include <qmacstyle_mac.h>
 #endif
 …
             // updates the state correctly, but skips showing the non-native version:
             setAttribute(Qt::WA_DontShowOnScreen);
+#ifndef QT_NO_FSCOMPLETER
+            //So the completer don't try to complete and therefore to show a popup
+            d->completer->setModel(0);
+#endif
         } else {
             d->nativeDialogInUse = false;
             setAttribute(Qt::WA_DontShowOnScreen, false);
+#ifndef QT_NO_FSCOMPLETER
+            if (d->proxyModel != 0)
+                d->completer->setModel(d->proxyModel);
+            else
+                d->completer->setModel(d->model);
+#endif
+        }
+    }
 …
 #endif
+/*
+    For Symbian file dialogs
+*/
+#if defined(Q_WS_S60)
+extern QString qtSymbianGetOpenFileName(const QString &caption,
+                                        const QString &dir,
+                                        const QString &filter);
+extern QStringList qtSymbianGetOpenFileNames(const QString &caption,
+                                             const QString &dir,
+                                             const QString &filter);
+extern QString qtSymbianGetSaveFileName(const QString &caption,
+                                        const QString &dir);
+extern QString qtSymbianGetExistingDirectory(const QString &caption,
+                                             const QString &dir);
+#endif
 /*!
     This is a convenience static function that returns an existing file
 …
     then a default caption will be used.
     On Windows and Mac OS X, this static function will use the native file
     dialog and not a QFileDialog.
+    On Windows, Mac OS X and Symbian^3, this static function will use the
+    native file dialog and not a QFileDialog.
     On Windows the dialog will spin a blocking modal event loop that will not
 …
     \a options includes DontResolveSymlinks, the file dialog will treat
     symlinks as regular directories.
+    On Symbian^3 the parameter \a selectedFilter has no meaning and the
+    \a options parameter is only used to define if the native file dialog is
+    used.
     \warning Do not delete \a parent during the execution of the dialog. If you
 …
     if (qt_filedialog_open_filename_hook && !(options & DontUseNativeDialog))
         return qt_filedialog_open_filename_hook(parent, caption, dir, filter, selectedFilter, options);
+#if defined(Q_WS_S60)
+    if (QSysInfo::s60Version() > QSysInfo::SV_S60_5_0 && !(options & DontUseNativeDialog))
+        return qtSymbianGetOpenFileName(caption, dir, filter);
+#endif
     QFileDialogArgs args;
     args.parent = parent;
 …
     then a default caption will be used.
     On Windows and Mac OS X, this static function will use the native file
     dialog and not a QFileDialog.
+    On Windows, Mac OS X and Symbian^3, this static function will use the
+    native file dialog and not a QFileDialog.
     On Windows the dialog will spin a blocking modal event loop that will not
 …
     \snippet doc/src/snippets/code/src_gui_dialogs_qfiledialog.cpp 10
+    On Symbian^3 the parameter \a selectedFilter has no meaning and the
+    \a options parameter is only used to define if the native file dialog is
+    used. On Symbian^3, this function can only return a single filename.
     \warning Do not delete \a parent during the execution of the dialog. If you
     want to do this, you should create the dialog yourself using one of the
 …
     if (qt_filedialog_open_filenames_hook && !(options & DontUseNativeDialog))
         return qt_filedialog_open_filenames_hook(parent, caption, dir, filter, selectedFilter, options);
+#if defined(Q_WS_S60)
+    if (QSysInfo::s60Version() > QSysInfo::SV_S60_5_0 && !(options & DontUseNativeDialog))
+        return qtSymbianGetOpenFileNames(caption, dir, filter);
+#endif
     QFileDialogArgs args;
     args.parent = parent;
 …
     a default caption will be used.
     On Windows and Mac OS X, this static function will use the native file
     dialog and not a QFileDialog.
+    On Windows, Mac OS X and Symbian^3, this static function will use the
+    native file dialog and not a QFileDialog.
     On Windows the dialog will spin a blocking modal event loop that will not
 …
     \a options includes DontResolveSymlinks the file dialog will treat symlinks
     as regular directories.
+    On Symbian^3 the parameters \a filter and \a selectedFilter have no
+    meaning. The \a options parameter is only used to define if the native file
+    dialog is used.
     \warning Do not delete \a parent during the execution of the dialog. If you
 …
     if (qt_filedialog_save_filename_hook && !(options & DontUseNativeDialog))
         return qt_filedialog_save_filename_hook(parent, caption, dir, filter, selectedFilter, options);
+#if defined(Q_WS_S60)
+    if (QSysInfo::s60Version() > QSysInfo::SV_S60_5_0 && !(options & DontUseNativeDialog))
+        return qtSymbianGetSaveFileName(caption, dir);
+#endif
     QFileDialogArgs args;
     args.parent = parent;
 …
     be set.
     On Windows and Mac OS X, this static function will use the native file
     dialog and not a QFileDialog. On Windows CE, if the device has no native
     file dialog, a QFileDialog will be used.
+    On Windows, Mac OS X and Symbian^3, this static function will use the
+    native file dialog and not a QFileDialog. On Windows CE, if the device has
+    no native file dialog, a QFileDialog will be used.
     On Unix/X11, the normal behavior of the file dialog is to resolve and
 …
     dialog just below the parent's title bar.
+    On Symbian^3 the \a options parameter is only used to define if the native
+    file dialog is used.
     \warning Do not delete \a parent during the execution of the dialog. If you
     want to do this, you should create the dialog yourself using one of the
 …
     if (qt_filedialog_existing_directory_hook && !(options & DontUseNativeDialog))
         return qt_filedialog_existing_directory_hook(parent, caption, dir, options);
+#if defined(Q_WS_S60)
+    if (QSysInfo::s60Version() > QSysInfo::SV_S60_5_0 && !(options & DontUseNativeDialog))
+        return qtSymbianGetExistingDirectory(caption, dir);
+#endif
     QFileDialogArgs args;
     args.parent = parent;

trunk/src/gui/dialogs/qfiledialog.h

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 …
     Q_OBJECT
     Q_ENUMS(ViewMode FileMode AcceptMode Option)
+    Q_FLAGS(Options)
     Q_PROPERTY(ViewMode viewMode READ viewMode WRITE setViewMode)
     Q_PROPERTY(FileMode fileMode READ fileMode WRITE setFileMode)

trunk/src/gui/dialogs/qfiledialog.ui

r769	r846
2	2	<comment>*********************************************************************
3	3	**
4		** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	4	** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
5	5	** All rights reserved.
6	6	** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qfiledialog_embedded.ui

r651	r846
2	2	<comment>*********************************************************************
3	3	**
4		** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	4	** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
5	5	** All rights reserved.
6	6	** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qfiledialog_mac.mm

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 …
 QT_USE_NAMESPACE
 @class QNSOpenSavePanelDelegate;
 @interface QNSOpenSavePanelDelegate : NSObject {
+@class QT_MANGLE_NAMESPACE(QNSOpenSavePanelDelegate);
+@interface QT_MANGLE_NAMESPACE(QNSOpenSavePanelDelegate) : NSObject {
     @public
     NSOpenPanel *mOpenPanel;
 …
 - (void)createTextField;
 - (void)createPopUpButton:(const QString &)selectedFilter hideDetails:(BOOL)hideDetails;
+- (QStringList)findStrippedFilterWithVisualFilterName:(QString)name;
 - (void)createAccessory;
 @end
 @implementation QNSOpenSavePanelDelegate
+@implementation QT_MANGLE_NAMESPACE(QNSOpenSavePanelDelegate)
 - (id)initWithAcceptMode:(QT_PREPEND_NAMESPACE(QFileDialog::AcceptMode))acceptMode
     title:(const QString &)title
-    nameFilters:(const QStringList &)nameFilters
-    selectedNameFilter:(const QString &)selectedNameFilter
     hideNameFilterDetails:(bool)hideNameFilterDetails
     qDirFilter:(QT_PREPEND_NAMESPACE(QDir::Filters))qDirFilter
 …
     mLastFilterCheckPath = new QString;
     mQDirFilterEntryList = new QStringList;
+    mNameFilterDropDownList = new QStringList(nameFilters);
+    mSelectedNameFilter = new QStringList(qt_clean_filter_list(selectedNameFilter));
+    mNameFilterDropDownList = new QStringList(priv->nameFilters);
+    QString selectedVisualNameFilter = priv->qFileDialogUi->fileTypeCombo->currentText();
+    mSelectedNameFilter = new QStringList([self findStrippedFilterWithVisualFilterName:selectedVisualNameFilter]);
     QFileInfo sel(selectFile);
     if (sel.isDir()){
 …
         mCurrentSelection = new QString(sel.absoluteFilePath());
+    }
     [mSavePanel setTitle:qt_mac_QStringToNSString(title)];
     [self createPopUpButton:selectedNameFilter hideDetails:hideNameFilterDetails];
+    [self createPopUpButton:selectedVisualNameFilter hideDetails:hideNameFilterDetails];
     [self createTextField];
     [self createAccessory];
 …
         return NO;
+    // Always accept directories regardless of their names (unless it is a bundle):
+    BOOL isDir;
+    if ([[NSFileManager defaultManager] fileExistsAtPath:filename isDirectory:&isDir] && isDir) {
+        if ([mSavePanel treatsFilePackagesAsDirectories] == NO) {
+            if ([[NSWorkspace sharedWorkspace] isFilePackageAtPath:filename] == NO)
+                return YES;
+        }
+    }
     QString qtFileName = QT_PREPEND_NAMESPACE(qt_mac_NSStringToQString)(filename);
     QFileInfo info(qtFileName.normalized(QT_PREPEND_NAMESPACE(QString::NormalizationForm_C)));
 …
     if (!mQDirFilterEntryList->contains(info.fileName()))
         return NO;
-    // Always accept directories regardless of their names:
-    BOOL isDir;
-    if ([[NSFileManager defaultManager] fileExistsAtPath:filename isDirectory:&isDir] && isDir)
-        return YES;
     // No filter means accept everything
 …
     Q_UNUSED(sender);
     QString selection = mNameFilterDropDownList->value([mPopUpButton indexOfSelectedItem]);
     *mSelectedNameFilter = QT_PREPEND_NAMESPACE(qt_clean_filter_list)(selection);
+    *mSelectedNameFilter = [self findStrippedFilterWithVisualFilterName:selection];
     [mSavePanel validateVisibleColumns];
     [self updateProperties];
 …
             QString filter = hideDetails ? [self removeExtensions:filters->at(i)] : filters->at(i);
             [mPopUpButton addItemWithTitle:QT_PREPEND_NAMESPACE(qt_mac_QStringToNSString)(filter)];
             if (filters->at(i) == selectedFilter)
+            if (filters->at(i).startsWith(selectedFilter))
                 [mPopUpButton selectItemAtIndex:i];
+        }
+    }
+}
+- (QStringList) findStrippedFilterWithVisualFilterName:(QString)name
+{
+    for (int i=0; i<mNameFilterDropDownList->size(); ++i) {
+        if (mNameFilterDropDownList->at(i).startsWith(name))
+            return qt_clean_filter_list(mNameFilterDropDownList->at(i));
+    }
+    return QStringList();
+}
 …
 #else
     QMacCocoaAutoReleasePool pool;
     QNSOpenSavePanelDelegate *delegate = static_cast<QNSOpenSavePanelDelegate *>(mDelegate);
+    QT_MANGLE_NAMESPACE(QNSOpenSavePanelDelegate) *delegate = static_cast<QT_MANGLE_NAMESPACE(QNSOpenSavePanelDelegate) *>(mDelegate);
     [delegate->mSavePanel setDirectory:qt_mac_QStringToNSString(directory)];
 #endif
 …
 #else
     QMacCocoaAutoReleasePool pool;
     QNSOpenSavePanelDelegate *delegate = static_cast<QNSOpenSavePanelDelegate *>(mDelegate);
+    QT_MANGLE_NAMESPACE(QNSOpenSavePanelDelegate) *delegate = static_cast<QT_MANGLE_NAMESPACE(QNSOpenSavePanelDelegate) *>(mDelegate);
     return qt_mac_NSStringToQString([delegate->mSavePanel directory]);
 #endif
 …
 #else
     QMacCocoaAutoReleasePool pool;
     QNSOpenSavePanelDelegate *delegate = static_cast<QNSOpenSavePanelDelegate *>(mDelegate);
+    QT_MANGLE_NAMESPACE(QNSOpenSavePanelDelegate) *delegate = static_cast<QT_MANGLE_NAMESPACE(QNSOpenSavePanelDelegate) *>(mDelegate);
     return [delegate selectedFiles];
 #endif
 …
 #else
     QMacCocoaAutoReleasePool pool;
     QNSOpenSavePanelDelegate *delegate = static_cast<QNSOpenSavePanelDelegate *>(mDelegate);
+    QT_MANGLE_NAMESPACE(QNSOpenSavePanelDelegate) *delegate = static_cast<QT_MANGLE_NAMESPACE(QNSOpenSavePanelDelegate) *>(mDelegate);
     bool hideDetails = q_func()->testOption(QFileDialog::HideNameFilterDetails);
     [delegate setNameFilters:filters hideDetails:hideDetails];
 …
     Q_Q(QFileDialog);
     QMacCocoaAutoReleasePool pool;
     QNSOpenSavePanelDelegate *delegate = static_cast<QNSOpenSavePanelDelegate *>(mDelegate);
+    QT_MANGLE_NAMESPACE(QNSOpenSavePanelDelegate) *delegate = static_cast<QT_MANGLE_NAMESPACE(QNSOpenSavePanelDelegate) *>(mDelegate);
     *(delegate->mQDirFilter) = model->filter();
     delegate->mFileMode = fileMode;
 …
 #else
         QMacCocoaAutoReleasePool pool;
         QNSOpenSavePanelDelegate *delegate = static_cast<QNSOpenSavePanelDelegate *>(mDelegate);
+        QT_MANGLE_NAMESPACE(QNSOpenSavePanelDelegate) *delegate = static_cast<QT_MANGLE_NAMESPACE(QNSOpenSavePanelDelegate) *>(mDelegate);
         [delegate->mPopUpButton selectItemAtIndex:index];
         [delegate filterChanged:nil];
 …
 #else
     QMacCocoaAutoReleasePool pool;
     QNSOpenSavePanelDelegate *delegate = static_cast<QNSOpenSavePanelDelegate *>(mDelegate);
+    QT_MANGLE_NAMESPACE(QNSOpenSavePanelDelegate) *delegate = static_cast<QT_MANGLE_NAMESPACE(QNSOpenSavePanelDelegate) *>(mDelegate);
     int index = [delegate->mPopUpButton indexOfSelectedItem];
 #endif
 …
 #else
     QMacCocoaAutoReleasePool pool;
     [reinterpret_cast<QNSOpenSavePanelDelegate *>(mDelegate) release];
+    [reinterpret_cast<QT_MANGLE_NAMESPACE(QNSOpenSavePanelDelegate) *>(mDelegate) release];
     mDelegate = 0;
 #endif
 …
     if (!visible == q->isHidden())
         return false;
+    if (q->windowFlags() & Qt::WindowStaysOnTopHint) {
+        // The native file dialog tries all it can to stay
+        // on the NSModalPanel level. And it might also show
+        // its own "create directory" dialog that we cannot control.
+        // So we need to use the non-native version in this case...
+        return false;
+    }
 #ifndef QT_MAC_USE_COCOA
 …
     NavFileOrFolderInfo *theInfo = static_cast<NavFileOrFolderInfo *>(info);
     QString file;
+    QString path;
     const QtMacFilterName &fn
            = fileDialogPrivate->filterInfo.filters.at(fileDialogPrivate->filterInfo.currentSelection);
 …
         UInt8 str_buffer[1024];
         FSRefMakePath(&ref, str_buffer, 1024);
         file = QString::fromUtf8(reinterpret_cast<const char *>(str_buffer));
         int slsh = file.lastIndexOf(QLatin1Char('/'));
+        path = QString::fromUtf8(reinterpret_cast<const char *>(str_buffer));
+        int slsh = path.lastIndexOf(QLatin1Char('/'));
         if (slsh != -1)
+            file = file.right(file.length() - slsh - 1);
+            file = path.right(path.length() - slsh - 1);
+        else
+            file = path;
+    }
     QStringList reg = fn.regexp.split(QLatin1String(";"));
 …
             return true;
+    }
+    return (theInfo->isFolder && !file.endsWith(QLatin1String(".app")));
+    if (theInfo->isFolder) {
+        if ([[NSWorkspace sharedWorkspace] isFilePackageAtPath:qt_mac_QStringToNSString(path)])
+            return false;
+        return true;
+    }
+    return false;
+}
 …
                                                        fileDialogPrivate->filterInfo.currentSelection);
             QStringList reg = fn.regexp.split(QLatin1String(";"), QString::SkipEmptyParts);
+            QString r = reg.first();
+            r  = r.right(r.length()-1);      // Strip the *
+            base += r;                        //"." + QString::number(s->menuType);
+            if (reg.count()) {
+                QString r = reg.first();
+                r  = r.right(r.length()-1);      // Strip the *
+                base += r;                        //"." + QString::number(s->menuType);
+            }
             NavDialogSetSaveFileName(p->context, QCFString::toCFStringRef(base));
+        }
 …
     bool selectDir = q->selectedFiles().isEmpty();
     QString selection(selectDir ? q->directory().absolutePath() : q->selectedFiles().value(0));
     QNSOpenSavePanelDelegate *delegate = [[QNSOpenSavePanelDelegate alloc]
+    QT_MANGLE_NAMESPACE(QNSOpenSavePanelDelegate) *delegate = [[QT_MANGLE_NAMESPACE(QNSOpenSavePanelDelegate) alloc]
         initWithAcceptMode:acceptMode
         title:q->windowTitle()
-        nameFilters:q->nameFilters()
-        selectedNameFilter:q->selectedNameFilter()
         hideNameFilterDetails:q->testOption(QFileDialog::HideNameFilterDetails)
         qDirFilter:model->filter()
 …
     QMacCocoaAutoReleasePool pool;
     createNSOpenSavePanelDelegate();
     QNSOpenSavePanelDelegate *delegate = static_cast<QNSOpenSavePanelDelegate *>(mDelegate);
+    QT_MANGLE_NAMESPACE(QNSOpenSavePanelDelegate) *delegate = static_cast<QT_MANGLE_NAMESPACE(QNSOpenSavePanelDelegate) *>(mDelegate);
     if (qt_mac_is_macsheet(q))
         [delegate showWindowModalSheet:q->parentWidget()];
 …
     } else {
         QMacCocoaAutoReleasePool pool;
         QNSOpenSavePanelDelegate *delegate = static_cast<QNSOpenSavePanelDelegate *>(mDelegate);
+        QT_MANGLE_NAMESPACE(QNSOpenSavePanelDelegate) *delegate = static_cast<QT_MANGLE_NAMESPACE(QNSOpenSavePanelDelegate) *>(mDelegate);
         [delegate closePanel];
         // Even when we hide it, we are still using a
 …
     Q_Q(QFileDialog);
     QMacCocoaAutoReleasePool pool;
     QNSOpenSavePanelDelegate *delegate = static_cast<QNSOpenSavePanelDelegate *>(mDelegate);
+    QT_MANGLE_NAMESPACE(QNSOpenSavePanelDelegate) *delegate = static_cast<QT_MANGLE_NAMESPACE(QNSOpenSavePanelDelegate) *>(mDelegate);
     [delegate runApplicationModalPanel];
     dialogResultCode_sys() == QDialog::Accepted ? q->accept() : q->reject();
 …
         return QDialog::Accepted;
 #else
     QNSOpenSavePanelDelegate *delegate = static_cast<QNSOpenSavePanelDelegate *>(mDelegate);
+    QT_MANGLE_NAMESPACE(QNSOpenSavePanelDelegate) *delegate = static_cast<QT_MANGLE_NAMESPACE(QNSOpenSavePanelDelegate) *>(mDelegate);
     return [delegate dialogResultCode];
 #endif

trunk/src/gui/dialogs/qfiledialog_p.h

r651	r846
1	1	/****************************************************************************
2	2	**
3		** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	3	** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
4	4	** All rights reserved.
5	5	** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qfiledialog_win.cpp

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 …
 #include <qdir.h>
 #include <qstringlist.h>
+#include <qlibrary.h>
+#include <private/qsystemlibrary_p.h>
+#include "qfiledialog_win_p.h"
 #ifndef QT_NO_THREAD
 …
 #endif
+#ifdef Q_WS_WINCE
 #include <shlobj.h>
+//At some point we can hope that mingw will support that interface
+#if !defined(Q_WS_WINCE) && !defined(Q_CC_MINGW)
+#include <shobjidl.h>
+#include <commdlg.h>
+bool qt_priv_ptr_valid = false;
+#else
+//we have to declare them here because they're not present for all SDK/compilers
+static const IID   QT_IID_IFileOpenDialog  = {0xd57c7288, 0xd4ad, 0x4768, {0xbe, 0x02, 0x9d, 0x96, 0x95, 0x32, 0xd9, 0x60} };
+static const IID   QT_IID_IShellItem       = {0x43826d1e, 0xe718, 0x42ee, {0xbc, 0x55, 0xa1, 0xe2, 0x61, 0xc3, 0x7b, 0xfe} };
+static const CLSID QT_CLSID_FileOpenDialog = {0xdc1c5a9c, 0xe88a, 0x4dde, {0xa5, 0xa1, 0x60, 0xf8, 0x2a, 0x20, 0xae, 0xf7} };
 #endif
+#include <objbase.h>
+#if defined(__IFileDialog_INTERFACE_DEFINED__) \
+        && defined(__IFileOpenDialog_INTERFACE_DEFINED__)
+#define USE_COMMON_ITEM_DIALOG
+#endif
+#ifdef Q_WS_WINCE
+#include <commdlg.h>
+#  ifndef BFFM_SETSELECTION
+#    define BFFM_SETSELECTION (WM_USER + 102)
+#  endif
+// Windows Mobile has a broken definition for BROWSEINFO
+// Only compile fix
+typedef struct qt_priv_browseinfo {
+    HWND          hwndOwner;
+    LPCITEMIDLIST pidlRoot;
+    LPWSTR        pszDisplayName;
+    LPCWSTR       lpszTitle;
+    UINT          ulFlags;
+    BFFCALLBACK   lpfn;
+    LPARAM        lParam;
+    int           iImage;
+} qt_BROWSEINFO;
+bool qt_priv_ptr_valid = false;
+#endif
+// Don't remove the lines below!
+//
+// resolving the W methods manually is needed, because Windows 95 doesn't include
+// these methods in Shell32.lib (not even stubs!), so you'd get an unresolved symbol
+// when Qt calls getExistingDirectory(), etc.
+typedef LPITEMIDLIST (WINAPI *PtrSHBrowseForFolder)(BROWSEINFO*);
+typedef qt_LPITEMIDLIST (WINAPI *PtrSHBrowseForFolder)(qt_BROWSEINFO*);
 static PtrSHBrowseForFolder ptrSHBrowseForFolder = 0;
 typedef BOOL (WINAPI *PtrSHGetPathFromIDList)(LPITEMIDLIST,LPWSTR);
+typedef BOOL (WINAPI *PtrSHGetPathFromIDList)(qt_LPITEMIDLIST, LPWSTR);
 static PtrSHGetPathFromIDList ptrSHGetPathFromIDList = 0;
 typedef HRESULT (WINAPI *PtrSHGetMalloc)(LPMALLOC *);
 …
         triedResolve = true;
 #if !defined(Q_WS_WINCE)
         QLibrary lib(QLatin1String("shell32"));
         ptrSHBrowseForFolder = (PtrSHBrowseForFolder) lib.resolve("SHBrowseForFolderW");
         ptrSHGetPathFromIDList = (PtrSHGetPathFromIDList) lib.resolve("SHGetPathFromIDListW");
         ptrSHGetMalloc = (PtrSHGetMalloc) lib.resolve("SHGetMalloc");
+        QSystemLibrary lib(L"shell32");
+        ptrSHBrowseForFolder = (PtrSHBrowseForFolder)lib.resolve("SHBrowseForFolderW");
+        ptrSHGetPathFromIDList = (PtrSHGetPathFromIDList)lib.resolve("SHGetPathFromIDListW");
+        ptrSHGetMalloc = (PtrSHGetMalloc)lib.resolve("SHGetMalloc");
 #else
         // CE stores them in a different lib and does not use unicode version
         HINSTANCE handle = LoadLibraryW(L"Ceshell");
+        HINSTANCE handle = LoadLibrary(L"Ceshell");
         ptrSHBrowseForFolder = (PtrSHBrowseForFolder)GetProcAddress(handle, L"SHBrowseForFolder");
         ptrSHGetPathFromIDList = (PtrSHGetPathFromIDList)GetProcAddress(handle, L"SHGetPathFromIDList");
 …
     ofn->lStructSize = sizeof(OPENFILENAME);
-    Q_ASSERT(!parent ||parent->testAttribute(Qt::WA_WState_Created));
     ofn->hwndOwner = parent ? parent->winId() : 0;
     ofn->lpstrFilter = (wchar_t*)tFilters.utf16();
 …
 #if defined(USE_COMMON_ITEM_DIALOG)
+#ifndef Q_WS_WINCE
 typedef HRESULT (WINAPI *PtrSHCreateItemFromParsingName)(PCWSTR pszPath, IBindCtx *pbc, REFIID riid, void **ppv);
 …
     if (!pSHCreateItemFromParsingName) {
         // This function is available only in Vista & above.
         QLibrary shellLib(QLatin1String("Shell32"));
+        QSystemLibrary shellLib(QLatin1String("Shell32"));
         pSHCreateItemFromParsingName = (PtrSHCreateItemFromParsingName)
             shellLib.resolve("SHCreateItemFromParsingName");
 …
     if (numFilters) {
         wchar_t *szData = (wchar_t*)winfilters.utf16();
         COMDLG_FILTERSPEC *filterSpec = new COMDLG_FILTERSPEC[numFilters];
+        qt_COMDLG_FILTERSPEC *filterSpec = new qt_COMDLG_FILTERSPEC[numFilters];
         for(int i = 0; i<numFilters; i++) {
             filterSpec[i].pszName = szData+offsets[i*2];
 …
     if (!tInitDir.isEmpty()) {
         IShellItem *psiDefaultFolder;
+        hr = pSHCreateItemFromParsingName((wchar_t*)tInitDir.utf16(),
+                                      NULL,
+                                      IID_PPV_ARGS(&psiDefaultFolder));
+        hr = pSHCreateItemFromParsingName((wchar_t*)tInitDir.utf16(), NULL, QT_IID_IShellItem,
+            reinterpret_cast<void**>(&psiDefaultFolder));
         if (SUCCEEDED(hr)) {
 …
+}
 QStringList qt_win_CID_get_open_file_names(const QFileDialogArgs &args,
+static QStringList qt_win_CID_get_open_file_names(const QFileDialogArgs &args,
                                        QString *initialDirectory,
                                        const QStringList &filterList,
 …
     // Multiple selection is allowed only in IFileOpenDialog.
     IFileOpenDialog *pfd = 0;
+    HRESULT hr = CoCreateInstance(CLSID_FileOpenDialog,
+                                  NULL,
+                                  CLSCTX_INPROC_SERVER,
+                                  IID_PPV_ARGS(&pfd));
+    HRESULT hr = CoCreateInstance(QT_CLSID_FileOpenDialog, NULL, CLSCTX_INPROC_SERVER, QT_IID_IFileOpenDialog,
+        reinterpret_cast<void**>(&pfd));
     if (SUCCEEDED(hr)) {
 …
+}
+QString qt_win_CID_get_existing_directory(const QFileDialogArgs &args)
+{
+    QString result;
+    QDialog modal_widget;
+    modal_widget.setAttribute(Qt::WA_NoChildEventsForParent, true);
+    modal_widget.setParent(args.parent, Qt::Window);
+    QApplicationPrivate::enterModal(&modal_widget);
+    IFileOpenDialog *pfd = 0;
+    HRESULT hr = CoCreateInstance(QT_CLSID_FileOpenDialog, NULL, CLSCTX_INPROC_SERVER,
+                                  QT_IID_IFileOpenDialog, reinterpret_cast<void**>(&pfd));
+    if (SUCCEEDED(hr)) {
+        qt_win_set_IFileDialogOptions(pfd, args.selection,
+                                      args.directory, args.caption,
+                                      QStringList(), QFileDialog::ExistingFiles,
+                                      args.options);
+        // Set the FOS_PICKFOLDERS flag
+        DWORD newOptions;
+        hr = pfd->GetOptions(&newOptions);
+        newOptions |= FOS_PICKFOLDERS;
+        if (SUCCEEDED(hr) && SUCCEEDED((hr = pfd->SetOptions(newOptions)))) {
+            QWidget *parentWindow = args.parent;
+            if (parentWindow)
+                parentWindow = parentWindow->window();
+            else
+                parentWindow = QApplication::activeWindow();
+            // Show the file dialog.
+            hr = pfd->Show(parentWindow ? parentWindow->winId() : 0);
+            if (SUCCEEDED(hr)) {
+                // Retrieve the result
+                IShellItem *psi = 0;
+                hr = pfd->GetResult(&psi);
+                if (SUCCEEDED(hr)) {
+                    // Retrieve the file name from shell item.
+                    wchar_t *pszPath;
+                    hr = psi->GetDisplayName(SIGDN_FILESYSPATH, &pszPath);
+                    if (SUCCEEDED(hr)) {
+                        result = QString::fromWCharArray(pszPath);
+                        CoTaskMemFree(pszPath);
+                    }
+                    psi->Release(); // Free the current item.
+                }
+            }
+        }
+    }
+    QApplicationPrivate::leaveModal(&modal_widget);
+    qt_win_eatMouseMove();
+    if (pfd)
+        pfd->Release();
+    return result;
+}
 #endif
 …
     // GetOpenFileName() will return only one folder name for all the files. To retrieve
     // the correct path for all selected files, we have to use Common Item Dialog interfaces.
 #if defined(USE_COMMON_ITEM_DIALOG)
+#ifndef Q_WS_WINCE
     if (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA && QSysInfo::WindowsVersion < QSysInfo::WV_NT_based)
         return qt_win_CID_get_open_file_names(args, initialDirectory, filterLst, selectedFilter, idx);
 …
         if (ptrSHGetPathFromIDList) {
             wchar_t path[MAX_PATH];
             ptrSHGetPathFromIDList(LPITEMIDLIST(lParam), path);
+            ptrSHGetPathFromIDList(qt_LPITEMIDLIST(lParam), path);
             QString tmpStr = QString::fromWCharArray(path);
             if (!tmpStr.isEmpty())
 …
+}
+#ifndef BIF_NEWDIALOGSTYLE
+#define BIF_NEWDIALOGSTYLE     0x0040   // Use the new dialog layout with the ability to resize
+QString qt_win_get_existing_directory(const QFileDialogArgs &args)
+{
+#ifndef Q_WS_WINCE
+    if (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA && QSysInfo::WindowsVersion < QSysInfo::WV_NT_based)
+        return qt_win_CID_get_existing_directory(args);
 #endif
-QString qt_win_get_existing_directory(const QFileDialogArgs &args)
+{
     QString currentDir = QDir::currentPath();
     QString result;
 …
     tTitle = args.caption;
-#if !defined(Q_WS_WINCE)
-    BROWSEINFO bi;
-#else
     qt_BROWSEINFO bi;
-#endif
     Q_ASSERT(!parent ||parent->testAttribute(Qt::WA_WState_Created));
 …
     qt_win_resolve_libs();
     if (ptrSHBrowseForFolder) {
         LPITEMIDLIST pItemIDList = ptrSHBrowseForFolder((BROWSEINFO*)&bi);
+        qt_LPITEMIDLIST pItemIDList = ptrSHBrowseForFolder(&bi);
         if (pItemIDList) {
             ptrSHGetPathFromIDList(pItemIDList, path);

trunk/src/gui/dialogs/qfileinfogatherer.cpp

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 …
 #ifndef QT_NO_FILESYSTEMMODEL
+bool QFileInfoGatherer::fetchedRoot = false;
+#ifdef QT_BUILD_INTERNAL
+static bool fetchedRoot = false;
+Q_AUTOTEST_EXPORT void qt_test_resetFetchedRoot()
+{
+    fetchedRoot = false;
+}
+Q_AUTOTEST_EXPORT bool qt_test_isFetchedRoot()
+{
+    return fetchedRoot;
+}
+#endif
 /*!
 …
+}
-/*
-    QFileInfo::permissions is different depending upon your platform.
-    "normalize this" so they can mean the same to us.
-*/
-QFile::Permissions QFileInfoGatherer::translatePermissions(const QFileInfo &fileInfo) const {
-    QFile::Permissions permissions = fileInfo.permissions();
-#ifdef Q_OS_WIN
-    return permissions;
-#else
-    QFile::Permissions p = permissions;
-    p &= ~(QFile::ReadUser|QFile::WriteUser|QFile::ExeUser);
-    if (                                     permissions & QFile::ReadOther
-        || (fileInfo.ownerId() == userId  && permissions & QFile::ReadOwner)
-        || (fileInfo.groupId() == groupId && permissions & QFile::ReadGroup))
-        p |= QFile::ReadUser;
-    if (                                     permissions & QFile::WriteOther
-        || (fileInfo.ownerId() == userId  && permissions & QFile::WriteOwner)
-        || (fileInfo.groupId() == groupId && permissions & QFile::WriteGroup))
-        p |= QFile::WriteUser;
-    if (                                     permissions & QFile::ExeOther
-        || (fileInfo.ownerId() == userId  && permissions & QFile::ExeOwner)
-        || (fileInfo.groupId() == groupId && permissions & QFile::ExeGroup))
-        p |= QFile::ExeUser;
-    return p;
-#endif
+}
 QExtendedInformation QFileInfoGatherer::getInfo(const QFileInfo &fileInfo) const
+{
     QExtendedInformation info(fileInfo);
     info.icon = m_iconProvider->icon(fileInfo);
-    info.setPermissions(translatePermissions(fileInfo));
     info.displayType = m_iconProvider->type(fileInfo);
 #ifndef QT_NO_FILESYSTEMWATCHER
 …
     // List drives
     if (path.isEmpty()) {
 #if defined Q_AUTOTEST_EXPORT
+#ifdef QT_BUILD_INTERNAL
         fetchedRoot = true;
 #endif
 …
+    }
+    QTime base = QTime::currentTime();
+    QElapsedTimer base;
+    base.start();
     QFileInfo fileInfo;
     bool firstTime = true;
 …
     if (!updatedFiles.isEmpty())
         emit updates(path, updatedFiles);
+}
+void QFileInfoGatherer::fetch(const QFileInfo &fileInfo, QTime &base, bool &firstTime, QList<QPair<QString, QFileInfo> > &updatedFiles, const QString &path) {
+    emit directoryLoaded(path);
+}
+void QFileInfoGatherer::fetch(const QFileInfo &fileInfo, QElapsedTimer &base, bool &firstTime, QList<QPair<QString, QFileInfo> > &updatedFiles, const QString &path) {
     updatedFiles.append(QPair<QString, QFileInfo>(fileInfo.fileName(), fileInfo));
+    QTime current = QTime::currentTime();
+    QElapsedTimer current;
+    current.start();
     if ((firstTime && updatedFiles.count() > 100) || base.msecsTo(current) > 1000) {
         emit updates(path, updatedFiles);

trunk/src/gui/dialogs/qfileinfogatherer_p.h

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 …
 #include <qfsfileengine.h>
 #include <qpair.h>
+#include <qstack.h>
 #include <qdatetime.h>
-#include <qstack.h>
 #include <qdir.h>
+#include <qelapsedtimer.h>
 QT_BEGIN_NAMESPACE
 …
+    }
     QFile::Permissions permissions() const {
+        return mPermissions;
+    }
+    void setPermissions (QFile::Permissions permissions) {
+        mPermissions = permissions;
+        return mFileInfo.permissions();
+    }
 …
 private :
     QFileInfo mFileInfo;
-    QFile::Permissions mPermissions;
 };
 …
     void newListOfFiles(const QString &directory, const QStringList &listOfFiles) const;
     void nameResolved(const QString &fileName, const QString &resolvedName) const;
+    void directoryLoaded(const QString &path);
 public:
 …
 private:
     void fetch(const QFileInfo &info, QTime &base, bool &firstTime, QList<QPair<QString, QFileInfo> > &updatedFiles, const QString &path);
+    void fetch(const QFileInfo &info, QElapsedTimer &base, bool &firstTime, QList<QPair<QString, QFileInfo> > &updatedFiles, const QString &path);
     QString translateDriveName(const QFileInfo &drive) const;
-    QFile::Permissions translatePermissions(const QFileInfo &fileInfo) const;
     QMutex mutex;
 …
     uint groupId;
 #endif
-public :
-    //for testing purpose
-    static bool fetchedRoot;
 };
 #endif // QT_NO_FILESYSTEMMODEL

trunk/src/gui/dialogs/qfilesystemmodel.cpp

-              r769
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 …
 #include <qt_windows.h>
 #endif
+#ifdef Q_OS_WIN32
+#include <QtCore/QVarLengthArray>
+#endif
 QT_BEGIN_NAMESPACE
 …
     directories. In the simplest case, it can be used with a suitable display
     widget as part of a browser or filter.
-    QFileSystemModel will not fetch any files or directories until setRootPath
-    is called.  This will prevent any unnecessary querying on the file system
-    until that point such as listing the drives on Windows.
-    Unlike the QDirModel, QFileSystemModel uses a separate thread to populate
-    itself so it will not cause the main thread to hang as the file system
-    is being queried.  Calls to rowCount() will return 0 until the model
-    populates a directory.
-    QFileSystemModel keeps a cache with file information. The cache is
-    automatically kept up to date using the QFileSystemWatcher.
     QFileSystemModel can be accessed using the standard interface provided by
 …
     \note QFileSystemModel requires an instance of a GUI application.
+    \section1 Example Usage
+    A directory model that displays the contents of a default directory
+    is usually constructed with a parent object:
+    \snippet doc/src/snippets/shareddirmodel/main.cpp 2
+    A tree view can be used to display the contents of the model
+    \snippet doc/src/snippets/shareddirmodel/main.cpp 4
+    and the contents of a particular directory can be displayed by
+    setting the tree view's root index:
+    \snippet doc/src/snippets/shareddirmodel/main.cpp 7
+    The view's root index can be used to control how much of a
+    hierarchical model is displayed. QDirModel provides a convenience
+    function that returns a suitable model index for a path to a
+    directory within the model.
+    \section1 Caching and Performance
+    QFileSystemModel will not fetch any files or directories until setRootPath()
+    is called.  This will prevent any unnecessary querying on the file system
+    until that point such as listing the drives on Windows.
+    Unlike QDirModel, QFileSystemModel uses a separate thread to populate
+    itself so it will not cause the main thread to hang as the file system
+    is being queried.  Calls to rowCount() will return 0 until the model
+    populates a directory.
+    QFileSystemModel keeps a cache with file information. The cache is
+    automatically kept up to date using the QFileSystemWatcher.
     \sa {Model Classes}
 */
 …
     This signal is emitted whenever a file with the \a oldName is successfully
     renamed to \a newName.  The file is located in in the directory \a path.
+*/
+/*!
+    \since 4.7
+    \fn void QFileSystemModel::directoryLoaded(const QString &path)
+    This signal is emitted when the gatherer thread has finished to load the \a path.
 */
 …
+}
 #ifdef Q_OS_WIN
+#ifdef Q_OS_WIN32
 static QString qt_GetLongPathName(const QString &strShortPath)
+{
+    QString longPath;
+    int i = 0;
+    if (strShortPath == QLatin1String(".")
+        || (strShortPath.startsWith(QLatin1String("//")))
+        || (strShortPath.startsWith(QLatin1String("\\\\")))) // unc
+    if (strShortPath.isEmpty()
+        || strShortPath == QLatin1String(".") || strShortPath == QLatin1String(".."))
         return strShortPath;
+    QString::const_iterator it = strShortPath.constBegin();
+    QString::const_iterator constEnd = strShortPath.constEnd();
+    do {
+        bool isSep = (*it == QLatin1Char('\\') || *it == QLatin1Char('/'));
+        if (isSep || it == constEnd) {
+            QString section = (it == constEnd ? strShortPath : strShortPath.left(i));
+            // FindFirstFile does not handle volumes ("C:"), so we have to catch that ourselves.
+            if (section.endsWith(QLatin1Char(':'))) {
+                longPath.append(section.toUpper());
+            } else {
+                HANDLE h;
+#ifndef Q_OS_WINCE
+                //We add the extend length prefix to handle long path
+                QString longSection = QLatin1String("\\\\?\\")+QDir::toNativeSeparators(section);
+#else
+                QString longSection = QDir::toNativeSeparators(section);
+#endif
+                WIN32_FIND_DATA findData;
+                h = ::FindFirstFile((wchar_t*)longSection.utf16(), &findData);
+                if (h != INVALID_HANDLE_VALUE) {
+                    longPath.append(QString::fromWCharArray(findData.cFileName));
+                    ::FindClose(h);
+                } else {
+                    longPath.append(section);
+                    break;
+                }
+            }
+            if (it != constEnd)
+                longPath.append(*it);
+            else
+                break;
+        }
+        ++it;
+        if (isSep && it == constEnd)    // break out if the last character is a separator
+            break;
+        ++i;
+    } while (true);
+    return longPath;
+    if (strShortPath.length() == 2 && strShortPath.endsWith(QLatin1Char(':')))
+        return strShortPath.toUpper();
+    const QString absPath = QDir(strShortPath).absolutePath();
+    if (absPath.startsWith(QLatin1String("//"))
+        || absPath.startsWith(QLatin1String("\\\\"))) // unc
+        return QDir::fromNativeSeparators(absPath);
+    if (absPath.startsWith(QLatin1Char('/')))
+        return QString();
+    const QString inputString = QLatin1String("\\\\?\\") + QDir::toNativeSeparators(absPath);
+    QVarLengthArray<TCHAR, MAX_PATH> buffer(MAX_PATH);
+    DWORD result = ::GetLongPathName((wchar_t*)inputString.utf16(),
+                                     buffer.data(),
+                                     buffer.size());
+    if (result > DWORD(buffer.size())) {
+        buffer.resize(result);
+        result = ::GetLongPathName((wchar_t*)inputString.utf16(),
+                                   buffer.data(),
+                                   buffer.size());
+    }
+    if (result > 4) {
+        QString longPath = QString::fromWCharArray(buffer.data() + 4); // ignoring prefix
+        longPath[0] = longPath.at(0).toUpper(); // capital drive letters
+        return QDir::fromNativeSeparators(longPath);
+    } else {
+        return QDir::fromNativeSeparators(strShortPath);
+    }
+}
 #endif
 …
     // Construct the nodes up to the new root path if they need to be built
     QString absolutePath;
 #ifdef Q_OS_WIN
+#ifdef Q_OS_WIN32
     QString longPath = qt_GetLongPathName(path);
 #else
 …
     case Qt::DisplayRole:
         switch (index.column()) {
         case 0: return d->name(index);
+        case 0: return d->displayName(index);
         case 1: return d->size(index);
         case 2: return d->type(index);
 …
             return resolvedSymLinks[fullPath];
+    }
-    // ### TODO it would be nice to grab the volume name if dirNode->parent == root
     return dirNode->fileName;
+}
+/*!
+    \internal
+*/
+QString QFileSystemModelPrivate::displayName(const QModelIndex &index) const
+{
+#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
+    QFileSystemNode *dirNode = node(index);
+    if (!dirNode->volumeName.isNull())
+        return dirNode->volumeName + QLatin1String(" (") + name(index) + QLatin1Char(')');
+#endif
+    return name(index);
+}
 …
     Q_D(QFileSystemModel);
 #ifdef Q_OS_WIN
+    QString longNewPath = QDir::fromNativeSeparators(qt_GetLongPathName(newPath));
+#ifdef Q_OS_WIN32
+    QString longNewPath = qt_GetLongPathName(newPath);
+#else
+    QString longNewPath = QDir::fromNativeSeparators(newPath);
+#endif
 #else
     QString longNewPath = newPath;
 …
 #ifndef QT_NO_FILESYSTEMWATCHER
     node->populate(info);
+#endif
+#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
+    //The parentNode is "" so we are listing the drives
+    if (parentNode->fileName.isEmpty()) {
+        wchar_t name[MAX_PATH + 1];
+        //GetVolumeInformation requires to add trailing backslash
+        const QString nodeName = fileName + QLatin1String("\\");
+        BOOL success = ::GetVolumeInformation((wchar_t *)(nodeName.utf16()),
+                name, MAX_PATH + 1, NULL, 0, NULL, NULL, 0);
+        if (success && name[0])
+            node->volumeName = QString::fromWCharArray(name);
+    }
 #endif
     parentNode->children.insert(fileName, node);
 …
     q->connect(&fileInfoGatherer, SIGNAL(nameResolved(QString,QString)),
             q, SLOT(_q_resolvedName(QString,QString)));
+    q->connect(&fileInfoGatherer, SIGNAL(directoryLoaded(QString)),
+               q, SIGNAL(directoryLoaded(QString)));
     q->connect(&delayedSortTimer, SIGNAL(timeout()), q, SLOT(_q_performDelayedSort()), Qt::QueuedConnection);
+    QHash<int, QByteArray> roles = q->roleNames();
+    roles.insertMulti(QFileSystemModel::FileIconRole, "fileIcon"); // == Qt::decoration
+    roles.insert(QFileSystemModel::FilePathRole, "filePath");
+    roles.insert(QFileSystemModel::FileNameRole, "fileName");
+    roles.insert(QFileSystemModel::FilePermissions, "filePermissions");
+    q->setRoleNames(roles);
+}

trunk/src/gui/dialogs/qfilesystemmodel.h

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 …
     void rootPathChanged(const QString &newPath);
     void fileRenamed(const QString &path, const QString &oldName, const QString &newName);
+    void directoryLoaded(const QString &path);
 public:

trunk/src/gui/dialogs/qfilesystemmodel_p.h

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 …
         QString fileName;
+#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
+        QString volumeName;
+#endif
         inline qint64 size() const { if (info && !info->isDir()) return info->size(); return 0; }
 …
     QIcon icon(const QModelIndex &index) const;
     QString name(const QModelIndex &index) const;
+    QString displayName(const QModelIndex &index) const;
     QString filePath(const QModelIndex &index) const;
     QString size(const QModelIndex &index) const;

trunk/src/gui/dialogs/qfontdialog.cpp

-              r769
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 …
     Q_Q(QFontDialog);
+#ifdef Q_WS_MAC
+    nativeDialogInUse = false;
+    delegate = 0;
+#endif
     q->setSizeGripEnabled(true);
     q->setWindowTitle(QFontDialog::tr("Select Font"));
 …
     familyList->setFocus();
     retranslateStrings();
-#ifdef Q_WS_MAC
-    delegate = 0;
-#endif
+}
 …
     Q_D(QFontDialog);
     if (d->delegate) {
+        QFontDialogPrivate::closeCocoaFontPanel(d->delegate);
+        QFontDialogPrivate::sharedFontPanelAvailable = true;
+        d->closeCocoaFontPanel();
         return;
+    }
 …
                                   const QString &title, QFontDialog::FontDialogOptions options)
+{
-#ifdef Q_WS_MAC
-    if (!(options & QFontDialog::DontUseNativeDialog)
-            && QFontDialogPrivate::sharedFontPanelAvailable) {
-        return QFontDialogPrivate::execCocoaFontPanel(ok, initial, parent,
-                       title.isEmpty() ? QFontDialog::tr("Select Font") : title, options);
+    }
-#endif
     QFontDialog dlg(parent);
     dlg.setOptions(options);
 …
 void QFontDialog::setVisible(bool visible)
+{
+    Q_D(QFontDialog);
+    if (visible) {
+        if (testAttribute(Qt::WA_WState_ExplicitShowHide) && !testAttribute(Qt::WA_WState_Hidden))
+            return;
+    } else if  (testAttribute(Qt::WA_WState_ExplicitShowHide) && testAttribute(Qt::WA_WState_Hidden))
+    if (testAttribute(Qt::WA_WState_ExplicitShowHide) && testAttribute(Qt::WA_WState_Hidden) != visible)
         return;
 #ifdef Q_WS_MAC
+    Q_D(QFontDialog);
     if (d->canBeNativeDialog()){
         if (d->setVisible_sys(visible)){

trunk/src/gui/dialogs/qfontdialog.h

r769	r846
1	1	/****************************************************************************
2	2	**
3		** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	3	** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
4	4	** All rights reserved.
5	5	** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qfontdialog_mac.mm

-              r769
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 …
 #endif
+QT_BEGIN_NAMESPACE
+extern void macStartInterceptNSPanelCtor();
+extern void macStopInterceptNSPanelCtor();
+extern NSButton *macCreateButton(const char *text, NSView *superview);
+extern bool qt_mac_is_macsheet(const QWidget *w); // qwidget_mac.mm
+QT_END_NAMESPACE
 QT_USE_NAMESPACE
 …
 const int StyleMask = NSTitledWindowMask | NSClosableWindowMask | NSResizableWindowMask;
 @class QCocoaFontPanelDelegate;
+@class QT_MANGLE_NAMESPACE(QCocoaFontPanelDelegate);
 …
 #endif
 @interface QCocoaFontPanelDelegate : NSObject <NSWindowDelegate> {
+@interface QT_MANGLE_NAMESPACE(QCocoaFontPanelDelegate) : NSObject <NSWindowDelegate> {
     NSFontPanel *mFontPanel;
     NSView *mStolenContentView;
 …
     CGFloat mDialogExtraWidth;
     CGFloat mDialogExtraHeight;
+    NSModalSession mModalSession;
+    int mReturnCode;
+    BOOL mAppModal;
+}
 - (id)initWithFontPanel:(NSFontPanel *)panel
 …
              extraWidth:(CGFloat)extraWidth
             extraHeight:(CGFloat)extraHeight;
+- (void)showModelessPanel;
+- (void)showWindowModalSheet:(QWidget *)docWidget;
+- (void)runApplicationModalPanel;
+- (BOOL)isAppModal;
 - (void)changeFont:(id)sender;
 - (void)changeAttributes:(id)sender;
-- (void)setModalSession:(NSModalSession)session;
 - (BOOL)windowShouldClose:(id)window;
 - (NSSize)windowWillResize:(NSWindow *)window toSize:(NSSize)proposedFrameSize;
 …
 - (void)finishOffWithCode:(NSInteger)result;
 - (void)cleanUpAfterMyself;
+- (void)setSubwindowStacking;
 @end
 …
+}
 @implementation QCocoaFontPanelDelegate
+@implementation QT_MANGLE_NAMESPACE(QCocoaFontPanelDelegate)
 - (id)initWithFontPanel:(NSFontPanel *)panel
        stolenContentView:(NSView *)stolenContentView
 …
     mDialogExtraWidth = extraWidth;
     mDialogExtraHeight = extraHeight;
+    mModalSession = 0;
+    mReturnCode = -1;
+    mAppModal = false;
     if (mPanelHackedWithButtons) {
 …
         [cancelButton setTarget:self];
+    }
     mQtFont = new QFont();
     return self;
+}
+- (void)setSubwindowStacking
+{
+#ifdef QT_MAC_USE_COCOA
+    // Stack the native dialog in front of its parent, if any:
+    QFontDialog *q = mPriv->fontDialog();
+    if (!qt_mac_is_macsheet(q)) {
+        if (QWidget *parent = q->parentWidget()) {
+            if (parent->isWindow()) {
+                [qt_mac_window_for(parent)
+                    addChildWindow:[mStolenContentView window] ordered:NSWindowAbove];
+            }
+        }
+    }
+#endif
+}
 - (void)dealloc
+{
     delete mQtFont;
     [super dealloc];
+}
+- (void)showModelessPanel
+{
+    mAppModal = false;
+    NSWindow *ourPanel = [mStolenContentView window];
+    [ourPanel makeKeyAndOrderFront:self];
+}
+- (void)runApplicationModalPanel
+{
+    QBoolBlocker nativeDialogOnTop(QApplicationPrivate::native_modal_dialog_active);
+    mAppModal = true;
+    NSWindow *ourPanel = [mStolenContentView window];
+    [ourPanel setReleasedWhenClosed:NO];
+    [NSApp runModalForWindow:ourPanel];
+    QAbstractEventDispatcher::instance()->interrupt();
+    if (mReturnCode == NSOKButton)
+        mPriv->fontDialog()->accept();
+    else
+        mPriv->fontDialog()->reject();
+}
+- (BOOL)isAppModal
+{
+    return mAppModal;
+}
+- (void)showWindowModalSheet:(QWidget *)docWidget
+{
+#ifdef QT_MAC_USE_COCOA
+    NSWindow *window = qt_mac_window_for(docWidget);
+#else
+    WindowRef hiwindowRef = qt_mac_window_for(docWidget);
+    NSWindow *window = [[NSWindow alloc] initWithWindowRef:hiwindowRef];
+    CFRetain(hiwindowRef);
+#endif
+    mAppModal = false;
+    NSWindow *ourPanel = [mStolenContentView window];
+    [NSApp beginSheet:ourPanel
+        modalForWindow:window
+        modalDelegate:0
+        didEndSelector:0
+        contextInfo:0 ];
+#ifndef QT_MAC_USE_COCOA
+    CFRelease(hiwindowRef);
+#endif
+}
 …
     if (mPriv)
         mPriv->updateSampleFont(*mQtFont);
+}
-- (void)setModalSession:(NSModalSession)session
+{
-    Q_ASSERT(!mModalSession);
-    mModalSession = session;
+}
 …
     const CGFloat ButtonWidth = qMin(qMax(ButtonMinWidth,
+                                          qMax(okSizeHint.width, cancelSizeHint.width)),
+                                     CGFloat((frameSize.width - 2.0 * ButtonSideMargin
+                                              - ButtonSpacing) * 0.5));
+                qMax(okSizeHint.width, cancelSizeHint.width)),
+            CGFloat((frameSize.width - 2.0 * ButtonSideMargin - ButtonSpacing) * 0.5));
     const CGFloat ButtonHeight = qMax(ButtonMinHeight,
                                      qMax(okSizeHint.height, cancelSizeHint.height));
 …
     [self setQtFont:qfontForCocoaFont([fontManager convertFont:[fontManager selectedFont]],
                                       *mQtFont)];
-    [[mStolenContentView window] close];
     [self finishOffWithCode:NSOKButton];
+}
 …
+{
     Q_ASSERT(mPanelHackedWithButtons);
-    [[mStolenContentView window] close];
     [self finishOffWithCode:NSCancelButton];
+}
 …
 - (void)finishOffWithCode:(NSInteger)code
+{
+    if (mPriv) {
+        if (mModalSession) {
+            [NSApp endModalSession:mModalSession];
+            mModalSession = 0;
+#ifdef QT_MAC_USE_COCOA
+    QFontDialog *q = mPriv->fontDialog();
+    if (QWidget *parent = q->parentWidget()) {
+        if (parent->isWindow()) {
+            [qt_mac_window_for(parent) removeChildWindow:[mStolenContentView window]];
+        }
+        // Hack alert!
+        // Since this code path was never intended to be followed when starting from exec
+        // we need to force the dialog to communicate the new font, otherwise the signal
+        // won't get emitted.
+        if(code == NSOKButton)
+            mPriv->sampleEdit->setFont([self qtFont]);
+        mPriv->done((code == NSOKButton) ? QDialog::Accepted : QDialog::Rejected);
+    }
+#endif
+    if(code == NSOKButton)
+        mPriv->sampleEdit->setFont([self qtFont]);
+    if (mAppModal) {
+        mReturnCode = code;
+        [NSApp stopModalWithCode:code];
     } else {
+        [NSApp stopModalWithCode:code];
+        if (code == NSOKButton)
+            mPriv->fontDialog()->accept();
+        else
+            mPriv->fontDialog()->reject();
+    }
+}
 …
 QT_BEGIN_NAMESPACE
+extern void macStartInterceptNSPanelCtor();
+extern void macStopInterceptNSPanelCtor();
+extern NSButton *macCreateButton(const char *text, NSView *superview);
+void *QFontDialogPrivate::openCocoaFontPanel(const QFont &initial,
+        QWidget *parent, const QString &title, QFontDialog::FontDialogOptions options,
+        QFontDialogPrivate *priv)
+{
+    Q_UNUSED(parent);   // we would use the parent if only NSFontPanel could be a sheet
+void QFontDialogPrivate::closeCocoaFontPanel()
+{
     QMacCocoaAutoReleasePool pool;
+    /*
+        The standard Cocoa font panel has no OK or Cancel button and
+        is created as a utility window. For strange reasons (which seem
+        to stem from the fact that the font panel is based on a NIB
+        file), the approach we use for the color panel doesn't work for
+        the font panel (and, inversely, the approach we use here doesn't
+        quite work for color panel, and crashed last time I tried). So
+        instead, we take the following steps:
+. Constructs a plain NSPanel that looks the way we want it
+            to look. Specifically, if the NoButtons option is off, we
+            construct a panel without the NSUtilityWindowMask flag
+            and with buttons (OK and Cancel).
+. Steal the content view from the shared NSFontPanel and
+            put it inside our new NSPanel's content view, together
+            with the OK and Cancel buttons.
+. Lay out the original content view and the buttons when
+            the font panel is shown and whenever it is resized.
+. Clean up after ourselves.
+         PS. Some customization is also done in QCocoaApplication
+         validModesForFontPanel:.
+    */
+    Qt::WindowModality modality = Qt::ApplicationModal;
+    if (priv)
+        modality = priv->fontDialog()->windowModality();
+    bool needButtons = !(options & QFontDialog::NoButtons);
+    // don't need our own panel if the title bar isn't visible anyway (in a sheet)
+    bool needOwnPanel = (needButtons && modality != Qt::WindowModal);
+    bool sharedFontPanelExisted = [NSFontPanel sharedFontPanelExists];
+    NSFontPanel *sharedFontPanel = [NSFontPanel sharedFontPanel];
+    [sharedFontPanel setHidesOnDeactivate:false];
+    // hack to ensure that QCocoaApplication's validModesForFontPanel:
+    // implementation is honored
+    if (!sharedFontPanelExisted && needOwnPanel) {
+        [sharedFontPanel makeKeyAndOrderFront:sharedFontPanel];
+        [sharedFontPanel close];
+    }
+    NSPanel *ourPanel = 0;
+    NSView *stolenContentView = 0;
+    NSButton *okButton = 0;
+    NSButton *cancelButton = 0;
+    CGFloat dialogExtraWidth = 0.0;
+    CGFloat dialogExtraHeight = 0.0;
+    if (!needOwnPanel) {
+        // we can reuse the NSFontPanel unchanged
+        ourPanel = sharedFontPanel;
+    } else {
+        // compute dialogExtra{Width,Height}
+        dialogExtraWidth = 2.0 * DialogSideMargin;
+        dialogExtraHeight = DialogTopMargin + ButtonTopMargin + ButtonMinHeight
+                            + ButtonBottomMargin;
+        // compute initial contents rectangle
+        NSRect contentRect = [sharedFontPanel contentRectForFrameRect:[sharedFontPanel frame]];
+        contentRect.size.width += dialogExtraWidth;
+        contentRect.size.height += dialogExtraHeight;
+        // create the new panel
+        ourPanel = [[NSPanel alloc] initWithContentRect:contentRect
+                                              styleMask:StyleMask
+                                                backing:NSBackingStoreBuffered
+                                                  defer:YES];
+        [ourPanel setReleasedWhenClosed:YES];
+    }
+    stolenContentView = [sharedFontPanel contentView];
+    if (needButtons) {
+        // steal the font panel's contents view
+        [stolenContentView retain];
+        [sharedFontPanel setContentView:0];
+        // create a new content view and add the stolen one as a subview
+        NSRect frameRect = { { 0.0, 0.0 }, { 0.0, 0.0 } };
+        NSView *ourContentView = [[NSView alloc] initWithFrame:frameRect];
+        [ourContentView addSubview:stolenContentView];
+        // create OK and Cancel buttons and add these as subviews
+        okButton = macCreateButton("&OK", ourContentView);
+        cancelButton = macCreateButton("Cancel", ourContentView);
+        [ourPanel setContentView:ourContentView];
+        [ourPanel setDefaultButtonCell:[okButton cell]];
+    }
+    // create a delegate and set it
+    QCocoaFontPanelDelegate *delegate =
+            [[QCocoaFontPanelDelegate alloc] initWithFontPanel:sharedFontPanel
+                                             stolenContentView:stolenContentView
+                                                      okButton:okButton
+                                                  cancelButton:cancelButton
+                                                          priv:priv
+                                                    extraWidth:dialogExtraWidth
+                                                   extraHeight:dialogExtraHeight];
+    [ourPanel setDelegate:delegate];
+    [[NSFontManager sharedFontManager] setDelegate:delegate];
+#ifdef QT_MAC_USE_COCOA
+    [[NSFontManager sharedFontManager] setTarget:delegate];
+#endif
+    setFont(delegate, initial);
+    // hack to get correct initial layout
+    NSRect frameRect = [ourPanel frame];
+    frameRect.size.width += 1.0;
+    [ourPanel setFrame:frameRect display:NO];
+    frameRect.size.width -= 1.0;
+    frameRect.size = [delegate windowWillResize:ourPanel toSize:frameRect.size];
+    [ourPanel setFrame:frameRect display:NO];
+    [ourPanel center];
+    [ourPanel setTitle:(NSString*)(CFStringRef)QCFString(title)];
+    if (priv) {
+        switch (modality) {
+        case Qt::WindowModal:
+            if (parent) {
+#ifndef QT_MAC_USE_COCOA
+                WindowRef hiwindowRef = qt_mac_window_for(parent);
+                NSWindow *window =
+                    [[NSWindow alloc] initWithWindowRef:hiwindowRef];
+                // Cocoa docs say I should retain the Carbon ref.
+                CFRetain(hiwindowRef);
+#else
+                NSWindow *window = qt_mac_window_for(parent);
+#endif
+                [NSApp beginSheet:ourPanel
+                   modalForWindow:window
+                    modalDelegate:0
+                   didEndSelector:0
+                      contextInfo:0];
+#ifndef QT_MAC_USE_COCOA
+                [window release];
+#endif
+                break;
+            }
+            // fallthrough
+        case Qt::ApplicationModal:
+            [delegate setModalSession:[NSApp beginModalSessionForWindow:ourPanel]];
+            break;
+        default:
+            [ourPanel makeKeyAndOrderFront:ourPanel];
+        }
+    }
+    return delegate;
+}
+void QFontDialogPrivate::closeCocoaFontPanel(void *delegate)
+{
+    QMacCocoaAutoReleasePool pool;
+    QCocoaFontPanelDelegate *theDelegate = static_cast<QCocoaFontPanelDelegate *>(delegate);
+    QT_MANGLE_NAMESPACE(QCocoaFontPanelDelegate) *theDelegate = static_cast<QT_MANGLE_NAMESPACE(QCocoaFontPanelDelegate) *>(delegate);
     NSWindow *ourPanel = [theDelegate actualPanel];
     [ourPanel close];
+    if ([theDelegate isAppModal])
+        [ourPanel release];
     [theDelegate cleanUpAfterMyself];
+    [theDelegate autorelease];
+}
+QFont QFontDialogPrivate::execCocoaFontPanel(bool *ok, const QFont &initial,
+        QWidget *parent, const QString &title, QFontDialog::FontDialogOptions options)
+{
+    QMacCocoaAutoReleasePool pool;
+    QCocoaFontPanelDelegate *delegate =
+            static_cast<QCocoaFontPanelDelegate *>(
+                openCocoaFontPanel(initial, parent, title, options));
+    NSWindow *ourPanel = [delegate actualPanel];
+    [ourPanel retain];
+    int rval = [NSApp runModalForWindow:ourPanel];
+    QFont font([delegate qtFont]);
+    [ourPanel release];
+    [delegate cleanUpAfterMyself];
+    [delegate release];
+    bool isOk = ((options & QFontDialog::NoButtons) || rval == NSOKButton);
+    if (ok)
+        *ok = isOk;
+    if (isOk) {
+        return font;
+    } else {
+        return initial;
+    }
+    [theDelegate release];
+    this->delegate = 0;
+    sharedFontPanelAvailable = true;
+}
 …
     [mgr setSelectedFont:nsFont isMultiple:NO];
+    [static_cast<QCocoaFontPanelDelegate *>(delegate) setQtFont:font];
+}
+void *QFontDialogPrivate::_q_constructNativePanel()
+{
+    [static_cast<QT_MANGLE_NAMESPACE(QCocoaFontPanelDelegate) *>(delegate) setQtFont:font];
+}
+void QFontDialogPrivate::createNSFontPanelDelegate()
+{
+    if (delegate)
+        return;
+    sharedFontPanelAvailable = false;
     QMacCocoaAutoReleasePool pool;
     bool sharedFontPanelExisted = [NSFontPanel sharedFontPanelExists];
     NSFontPanel *sharedFontPanel = [NSFontPanel sharedFontPanel];
 …
     // compute dialogExtra{Width,Height}
     dialogExtraWidth = 2.0 * DialogSideMargin;
+    dialogExtraHeight = DialogTopMargin + ButtonTopMargin + ButtonMinHeight
+                        + ButtonBottomMargin;
+    dialogExtraHeight = DialogTopMargin + ButtonTopMargin + ButtonMinHeight + ButtonBottomMargin;
     // compute initial contents rectangle
 …
                         defer:YES];
     [ourPanel setReleasedWhenClosed:YES];
     stolenContentView = [sharedFontPanel contentView];
 …
         [ourPanel setDefaultButtonCell:[okButton cell]];
+    }
+    // create a delegate and set it
     QCocoaFontPanelDelegate *delegate =
             [[QCocoaFontPanelDelegate alloc] initWithFontPanel:sharedFontPanel
+    // create the delegate and set it
+    QT_MANGLE_NAMESPACE(QCocoaFontPanelDelegate) *del = [[QT_MANGLE_NAMESPACE(QCocoaFontPanelDelegate) alloc] initWithFontPanel:sharedFontPanel
                                              stolenContentView:stolenContentView
                                                       okButton:okButton
 …
                                                     extraWidth:dialogExtraWidth
                                                    extraHeight:dialogExtraHeight];
+    [ourPanel setDelegate:delegate];
+    [[NSFontManager sharedFontManager] setDelegate:delegate];
+    delegate = del;
+    [ourPanel setDelegate:del];
+    [[NSFontManager sharedFontManager] setDelegate:del];
 #ifdef QT_MAC_USE_COCOA
     [[NSFontManager sharedFontManager] setTarget:delegate];
 #endif
     setFont(delegate, QApplication::font());
+    [[NSFontManager sharedFontManager] setTarget:del];
+#endif
+    setFont(del, q_func()->currentFont());
+    {
 …
         [ourPanel setFrame:frameRect display:NO];
         frameRect.size.width -= 1.0;
         frameRect.size = [delegate windowWillResize:ourPanel toSize:frameRect.size];
+        frameRect.size = [del windowWillResize:ourPanel toSize:frameRect.size];
         [ourPanel setFrame:frameRect display:NO];
         [ourPanel center];
+    }
+    [del setSubwindowStacking];
     NSString *title = @"Select font";
     [ourPanel setTitle:title];
-    [delegate setModalSession:[NSApp beginModalSessionForWindow:ourPanel]];
-    return delegate;
+}
 …
 void QFontDialogPrivate::_q_macRunNativeAppModalPanel()
+{
+    QBoolBlocker nativeDialogOnTop(QApplicationPrivate::native_modal_dialog_active);
+    createNSFontPanelDelegate();
+    QT_MANGLE_NAMESPACE(QCocoaFontPanelDelegate) *del = static_cast<QT_MANGLE_NAMESPACE(QCocoaFontPanelDelegate) *>(delegate);
+    [del runApplicationModalPanel];
+}
+bool QFontDialogPrivate::showCocoaFontPanel()
+{
+    if (!sharedFontPanelAvailable)
+        return false;
     Q_Q(QFontDialog);
+    QCocoaFontPanelDelegate *delegate = (QCocoaFontPanelDelegate *)_q_constructNativePanel();
+    NSWindow *ourPanel = [delegate actualPanel];
+    [ourPanel retain];
+    int rval = [NSApp runModalForWindow:ourPanel];
+    QAbstractEventDispatcher::instance()->interrupt();
+    [ourPanel release];
+    [delegate cleanUpAfterMyself];
+    [delegate release];
+    bool isOk = (rval == NSOKButton);
+    if(isOk)
+        rescode = QDialog::Accepted;
+    QMacCocoaAutoReleasePool pool;
+    createNSFontPanelDelegate();
+    QT_MANGLE_NAMESPACE(QCocoaFontPanelDelegate) *del = static_cast<QT_MANGLE_NAMESPACE(QCocoaFontPanelDelegate) *>(delegate);
+    if (qt_mac_is_macsheet(q))
+        [del showWindowModalSheet:q->parentWidget()];
     else
+        rescode = QDialog::Rejected;
+}
+        [del showModelessPanel];
+    return true;
+}
+bool QFontDialogPrivate::hideCocoaFontPanel()
+{
+    if (!delegate){
+        // Nothing to do. We return false to leave the question
+        // open regarding whether or not to go native:
+        return false;
+    } else {
+        closeCocoaFontPanel();
+        // Even when we hide it, we are still using a
+        // native dialog, so return true:
+        return true;
+    }
+}
 bool QFontDialogPrivate::setVisible_sys(bool visible)
+{
 …
     if (!visible == q->isHidden())
         return false;
+    return visible;
+    return visible ? showCocoaFontPanel() : hideCocoaFontPanel();
+}

trunk/src/gui/dialogs/qfontdialog_p.h

-              r769
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 …
 #ifdef Q_WS_MAC
-    static void *openCocoaFontPanel(const QFont &initial,
-            QWidget *parent, const QString &title,
-            QFontDialog::FontDialogOptions options,
-            QFontDialogPrivate *priv = 0);
-    static void closeCocoaFontPanel(void *delegate);
-    static QFont execCocoaFontPanel(bool *ok, const QFont &initial, QWidget *parent,
-            const QString &title, QFontDialog::FontDialogOptions options);
     static void setFont(void *delegate, const QFont &font);
 …
     void *delegate;
+    void closeCocoaFontPanel();
     bool nativeDialogInUse;
     bool canBeNativeDialog();
     bool setVisible_sys(bool visible);
     void *_q_constructNativePanel();
+    void createNSFontPanelDelegate();
     void _q_macRunNativeAppModalPanel();
     void mac_nativeDialogModalHelp();
+    bool showCocoaFontPanel();
+    bool hideCocoaFontPanel();
     static bool sharedFontPanelAvailable;

trunk/src/gui/dialogs/qfscompleter_p.h

r651	r846
1	1	/****************************************************************************
2	2	**
3		** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	3	** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
4	4	** All rights reserved.
5	5	** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qinputdialog.cpp

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 …
     mainLayout = new QVBoxLayout(q);
+    //we want to let the input dialog grow to available size on Symbian.
+#ifndef Q_OS_SYMBIAN
     mainLayout->setSizeConstraint(QLayout::SetMinAndMaxSize);
+#else
+    label->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+#endif
     mainLayout->addWidget(label);
     mainLayout->addWidget(inputWidget);
 …
     if (!lineEdit) {
         lineEdit = new QLineEdit(q);
+#ifndef QT_NO_IM
+        qt_widget_private(lineEdit)->inheritsInputMethodHints = 1;
+#endif
         lineEdit->hide();
         QObject::connect(lineEdit, SIGNAL(textChanged(QString)),
 …
     if (!comboBox) {
         comboBox = new QComboBox(q);
+#ifndef QT_NO_IM
+        qt_widget_private(comboBox)->inheritsInputMethodHints = 1;
+#endif
         comboBox->hide();
         QObject::connect(comboBox, SIGNAL(editTextChanged(QString)),
 …
         d->label->setText(text);
+    }
+#ifdef Q_OS_SYMBIAN
+    d->label->setWordWrap(true);
+#endif
+}

trunk/src/gui/dialogs/qinputdialog.h

r651	r846
1	1	/****************************************************************************
2	2	**
3		** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	3	** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
4	4	** All rights reserved.
5	5	** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qmessagebox.cpp

-              r769
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 …
 #ifndef QT_NO_CONTEXTMENU
             QMenu *menu = createStandardContextMenu();
             menu->exec(e->globalPos());
             delete menu;
+            menu->setAttribute(Qt::WA_DeleteOnClose);
+            menu->popup(e->globalPos());
 #else
             Q_UNUSED(e);
 …
     void setText(const QString &text) { textEdit->setPlainText(text); }
     QString text() const { return textEdit->toPlainText(); }
-    QString label(DetailButtonLabel label)
-        { return label == ShowLabel ? QMessageBox::tr("Show Details...")
-                                    : QMessageBox::tr("Hide Details..."); }
 private:
     TextEdit *textEdit;
 };
 #endif // QT_NO_TEXTEDIT
+class DetailButton : public QPushButton
+{
+public:
+    DetailButton(QWidget *parent) : QPushButton(label(ShowLabel), parent)
+    {
+        setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+    }
+    QString label(DetailButtonLabel label) const
+    { return label == ShowLabel ? QMessageBox::tr("Show Details...") : QMessageBox::tr("Hide Details..."); }
+    void setLabel(DetailButtonLabel lbl)
+    { setText(label(lbl)); }
+    QSize sizeHint() const
+    {
+        ensurePolished();
+        QStyleOptionButton opt;
+        initStyleOption(&opt);
+        const QFontMetrics fm = fontMetrics();
+        opt.text = label(ShowLabel);
+        QSize sz = fm.size(Qt::TextShowMnemonic, opt.text);
+        QSize ret = style()->sizeFromContents(QStyle::CT_PushButton, &opt, sz, this).
+                      expandedTo(QApplication::globalStrut());
+        opt.text = label(HideLabel);
+        sz = fm.size(Qt::TextShowMnemonic, opt.text);
+        ret.expandedTo(style()->sizeFromContents(QStyle::CT_PushButton, &opt, sz, this).
+                      expandedTo(QApplication::globalStrut()));
+        return ret;
+    }
+};
 class QMessageBoxPrivate : public QDialogPrivate
 …
     QPushButton *defaultButton;
     QAbstractButton *clickedButton;
     QPushButton *detailsButton;
+    DetailButton *detailsButton;
 #ifndef QT_NO_TEXTEDIT
     QMessageBoxDetailsText *detailsText;
 …
 #ifndef QT_NO_TEXTEDIT
     if (detailsButton && detailsText && button == detailsButton) {
         detailsButton->setText(detailsText->isHidden() ? detailsText->label(HideLabel) : detailsText->label(ShowLabel));
+        detailsButton->setLabel(detailsText->isHidden() ? HideLabel : ShowLabel);
         detailsText->setHidden(!detailsText->isHidden());
         updateSize();
 …
     arguments are passed to the QDialog constructor.
+    If \a parent is 0, the message box is an \l{Qt::ApplicationModal}
+    {application modal} dialog box. If \a parent is a widget, the
+    message box is \l{Qt::WindowModal} {window modal} relative to \a
+    parent.
+    The message box is an \l{Qt::ApplicationModal} {application modal}
+    dialog box.
     On Mac OS X, if \a parent is not 0 and you want your message box
 …
     {escape button} is returned.
+    If \a parent is 0, the message box is an \l{Qt::ApplicationModal}
+    {application modal} dialog box. If \a parent is a widget, the
+    message box is \l{Qt::WindowModal} {window modal} relative to \a
+    parent.
+    The message box is an \l{Qt::ApplicationModal} {application modal}
+    dialog box.
     \sa question(), warning(), critical()
 …
     {escape button} is returned.
+    If \a parent is 0, the message box is an \l{Qt::ApplicationModal}
+    {application modal} dialog box. If \a parent is a widget, the
+    message box is \l{Qt::WindowModal} {window modal} relative to \a
+    parent.
+    The message box is an \l{Qt::ApplicationModal} {application modal}
+    dialog box.
     \sa information(), warning(), critical()
 …
     {escape button} is returned.
+    If \a parent is 0, the message box is an \l{Qt::ApplicationModal}
+    {application modal} dialog box. If \a parent is a widget, the
+    message box is \l{Qt::WindowModal} {window modal} relative to \a
+    parent.
+    The message box is an \l{Qt::ApplicationModal} {application modal}
+    dialog box.
     \sa question(), information(), critical()
 …
     {escape button} is returned.
+    If \a parent is 0, the message box is an \l{Qt::ApplicationModal}
+    {application modal} dialog box. If \a parent is a widget, the
+    message box is \l{Qt::WindowModal} {window modal} relative to \a
+    parent.
+    The message box is an \l{Qt::ApplicationModal} {application modal}
+    dialog box.
   \warning Do not delete \a parent during the execution of the dialog.
 …
     The about box has a single button labelled "OK". On Mac OS X, the
     about box is popped up as a modeless window; on other platforms,
     it is currently a window modal.
+    it is currently application modal.
     \sa QWidget::windowIcon(), QApplication::activeWindow()
 …
     On Mac OS X, the about box is popped up as a modeless window; on
     other platforms, it is currently window modal.
+    other platforms, it is currently application modal.
     \sa QApplication::aboutQt()
 …
         "<p>Please see <a href=\"http://qt.nokia.com/products/licensing\">qt.nokia.com/products/licensing</a> "
         "for an overview of Qt licensing.</p>"
         "<p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</p>"
+        "<p>Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</p>"
         "<p>Qt is a Nokia product. See <a href=\"http://qt.nokia.com/\">qt.nokia.com</a> "
         "for more information.</p>"
 …
 #ifndef QT_NO_TEXTEDIT
     if (detailsButton)
         detailsButton->setText(detailsText->isHidden() ? detailsText->label(HideLabel) : detailsText->label(ShowLabel));
+        detailsButton->setLabel(detailsText->isHidden() ? HideLabel : ShowLabel);
 #endif
+}
 …
     \snippet doc/src/snippets/dialogs/dialogs.cpp 2
+    If \a parent is 0, the message box is an \l{Qt::ApplicationModal}
+    {application modal} dialog box. If \a parent is a widget, the
+    message box is \l{Qt::WindowModal} {window modal} relative to \a
+    parent.
+    The message box is an \l{Qt::ApplicationModal} {application modal}
+    dialog box.
     The \a parent and \a f arguments are passed to
 …
     of the button that was clicked.
+    If \a parent is 0, the message box is an \l{Qt::ApplicationModal}
+    {application modal} dialog box. If \a parent is a widget, the
+    message box is \l{Qt::WindowModal} {window modal} relative to \a
+    parent.
+    The message box is an \l{Qt::ApplicationModal} {application modal}
+    dialog box.
   \warning Do not delete \a parent during the execution of the dialog.
 …
     the relevant button.
+    If \a parent is 0, the message box is an \l{Qt::ApplicationModal}
+    {application modal} dialog box. If \a parent is a widget, the
+    message box is \l{Qt::WindowModal} {window modal} relative to \a
+    parent.
+    The message box is an \l{Qt::ApplicationModal} {application modal}
+    dialog box.
   \warning Do not delete \a parent during the execution of the dialog.
 …
     of the button that was clicked.
+    If \a parent is 0, the message box is an \l{Qt::ApplicationModal}
+    {application modal} dialog box. If \a parent is a widget, the
+    message box is \l{Qt::WindowModal} {window modal} relative to \a
+    parent.
+    The message box is an \l{Qt::ApplicationModal} {application modal}
+    dialog box.
   \warning Do not delete \a parent during the execution of the dialog.
 …
     the relevant button.
+    If \a parent is 0, the message box is an \l{Qt::ApplicationModal}
+    {application modal} dialog box. If \a parent is a widget, the
+    message box is \l{Qt::WindowModal} {window modal} relative to \a
+    parent.
+    The message box is an \l{Qt::ApplicationModal} {application modal}
+    dialog box.
   \warning Do not delete \a parent during the execution of the dialog.
 …
     of the button that was clicked.
+    If \a parent is 0, the message box is an \l{Qt::ApplicationModal}
+    {application modal} dialog box. If \a parent is a widget, the
+    message box is \l{Qt::WindowModal} {window modal} relative to \a
+    parent.
+    The message box is an \l{Qt::ApplicationModal} {application modal}
+    dialog box.
   \warning Do not delete \a parent during the execution of the dialog.
 …
     the relevant button.
+    If \a parent is 0, the message box is an \l{Qt::ApplicationModal}
+    {application modal} dialog box. If \a parent is a widget, the
+    message box is \l{Qt::WindowModal} {window modal} relative to \a
+    parent.
+    The message box is an \l{Qt::ApplicationModal} {application modal}
+    dialog box.
   \warning Do not delete \a parent during the execution of the dialog.
 …
     of the button that was clicked.
+    If \a parent is 0, the message box is an \l{Qt::ApplicationModal}
+    {application modal} dialog box. If \a parent is a widget, the
+    message box is \l{Qt::WindowModal} {window modal} relative to \a
+    parent.
+    The message box is an \l{Qt::ApplicationModal} {application modal}
+    dialog box.
   \warning Do not delete \a parent during the execution of the dialog.
 …
     the relevant button.
+    If \a parent is 0, the message box is an \l{Qt::ApplicationModal}
+    {application modal} dialog box. If \a parent is a widget, the
+    message box is \l{Qt::WindowModal} {window modal} relative to \a
+    parent.
+    The message box is an \l{Qt::ApplicationModal} {application modal}
+    dialog box.
   \warning Do not delete \a parent during the execution of the dialog.
 …
         d->detailsText->hide();
+    }
+    if (!d->detailsButton) {
+        d->detailsButton = new QPushButton(d->detailsText->label(ShowLabel), this);
+        QPushButton hideDetails(d->detailsText->label(HideLabel));
+        d->detailsButton->setFixedSize(d->detailsButton->sizeHint().expandedTo(hideDetails.sizeHint()));
+    }
+    if (!d->detailsButton)
+        d->detailsButton = new DetailButton(this);
     d->detailsText->setText(text);
+}

trunk/src/gui/dialogs/qmessagebox.h

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 …
  "%2, found Qt %3.").arg(qAppName()).arg(QString::fromLatin1(\
 str)).arg(QString::fromLatin1(qVersion())); QMessageBox::critical(0, QApplication::tr(\
 "Incompatible Qt Library Error"), s, QMessageBox::Abort, 0); qFatal(s.toLatin1().data()); }}
+"Incompatible Qt Library Error"), s, QMessageBox::Abort, 0); qFatal("%s", s.toLatin1().data()); }}
 #endif // QT_NO_MESSAGEBOX

trunk/src/gui/dialogs/qnspanelproxy_mac.mm

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 …
 QT_USE_NAMESPACE
 @class QNSPanelProxy;
 @interface QNSPanelProxy : NSWindow {
+@class QT_MANGLE_NAMESPACE(QNSPanelProxy);
+@interface QT_MANGLE_NAMESPACE(QNSPanelProxy) : NSWindow {
+}
 - (id)initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)windowStyle
 …
 @end
 @implementation QNSPanelProxy
+@implementation QT_MANGLE_NAMESPACE(QNSPanelProxy)
 - (id)initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)windowStyle
       backing:(NSBackingStoreType)bufferingType defer:(BOOL)deferCreation
 …
 @end
 @class QNSWindowProxy;
 @interface QNSWindowProxy : NSWindow {
+@class QT_MANGLE_NAMESPACE(QNSWindowProxy);
+@interface QT_MANGLE_NAMESPACE(QNSWindowProxy) : NSWindow {
+}
 - (void)setTitle:(NSString *)title;
 …
 @end
 @implementation QNSWindowProxy
+@implementation QT_MANGLE_NAMESPACE(QNSWindowProxy)
 - (void)setTitle:(NSString *)title
+{
 …
     macStartIntercept(@selector(initWithContentRect:styleMask:backing:defer:),
                       @selector(qt_fakeInitWithContentRect:styleMask:backing:defer:),
                       [NSPanel class], [QNSPanelProxy class]);
+                      [NSPanel class], [QT_MANGLE_NAMESPACE(QNSPanelProxy) class]);
     macStartIntercept(@selector(initWithContentRect:styleMask:backing:defer:screen:),
                       @selector(qt_fakeInitWithContentRect:styleMask:backing:defer:screen:),
                       [NSPanel class], [QNSPanelProxy class]);
+                      [NSPanel class], [QT_MANGLE_NAMESPACE(QNSPanelProxy) class]);
+}
 …
     macStopIntercept(@selector(initWithContentRect:styleMask:backing:defer:screen:),
                      @selector(qt_fakeInitWithContentRect:styleMask:backing:defer:screen:),
                      [NSPanel class], [QNSPanelProxy class]);
+                     [NSPanel class], [QT_MANGLE_NAMESPACE(QNSPanelProxy) class]);
     macStopIntercept(@selector(initWithContentRect:styleMask:backing:defer:),
                      @selector(qt_fakeInitWithContentRect:styleMask:backing:defer:),
                      [NSPanel class], [QNSPanelProxy class]);
+                     [NSPanel class], [QT_MANGLE_NAMESPACE(QNSPanelProxy) class]);
+}
 …
     currentWindow = window;
     macStartIntercept(@selector(setTitle:), @selector(qt_fakeSetTitle:),
                       [NSWindow class], [QNSWindowProxy class]);
+                      [NSWindow class], [QT_MANGLE_NAMESPACE(QNSWindowProxy) class]);
+}
 …
     currentWindow = 0;
     macStopIntercept(@selector(setTitle:), @selector(qt_fakeSetTitle:),
                      [NSWindow class], [QNSWindowProxy class]);
+                     [NSWindow class], [QT_MANGLE_NAMESPACE(QNSWindowProxy) class]);
+}

trunk/src/gui/dialogs/qpagesetupdialog.cpp

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 …
     page setup dialog.
+    In Symbian, there is no support for printing. Hence, this dialog should not
+    be used in Symbian.
     \sa QPrinter, QPrintDialog
 */

trunk/src/gui/dialogs/qpagesetupdialog.h

r651	r846
1	1	/****************************************************************************
2	2	**
3		** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	3	** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
4	4	** All rights reserved.
5	5	** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qpagesetupdialog_mac.mm

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 …
 QT_USE_NAMESPACE
 @class QCocoaPageLayoutDelegate;
 @interface QCocoaPageLayoutDelegate : NSObject {
+@class QT_MANGLE_NAMESPACE(QCocoaPageLayoutDelegate);
+@interface QT_MANGLE_NAMESPACE(QCocoaPageLayoutDelegate) : NSObject {
     QMacPrintEnginePrivate *pe;
+}
 …
 @end
 @implementation QCocoaPageLayoutDelegate
+@implementation QT_MANGLE_NAMESPACE(QCocoaPageLayoutDelegate)
 - (id)initWithMacPrintEngine:(QMacPrintEnginePrivate *)printEngine;
+{
 …
     // Keep a copy to this since we plan on using it for a bit.
     [pageLayout retain];
     QCocoaPageLayoutDelegate *delegate = [[QCocoaPageLayoutDelegate alloc] initWithMacPrintEngine:ep];
+    QT_MANGLE_NAMESPACE(QCocoaPageLayoutDelegate) *delegate = [[QT_MANGLE_NAMESPACE(QCocoaPageLayoutDelegate) alloc] initWithMacPrintEngine:ep];
     if (modality == Qt::ApplicationModal) {
 …
 void QPageSetupDialogPrivate::closeCocoaPageLayout()
+{
+    // NSPageLayout can change the session behind our back and then our
+    // d->ep->session object will become a dangling pointer. Update it
+    // based on the "current" session
+    ep->session = static_cast<PMPrintSession>([ep->printInfo PMPrintSession]);
     [pageLayout release];
     pageLayout = 0;

trunk/src/gui/dialogs/qpagesetupdialog_unix.cpp

r651	r846
1	1	/****************************************************************************
2	2	**
3		** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	3	** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
4	4	** All rights reserved.
5	5	** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qpagesetupdialog_unix_p.h

r651	r846
1	1	/****************************************************************************
2	2	**
3		** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	3	** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
4	4	** All rights reserved.
5	5	** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qpagesetupdialog_win.cpp

r651	r846
1	1	/****************************************************************************
2	2	**
3		** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	3	** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
4	4	** All rights reserved.
5	5	** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qprintdialog.h

r769	r846
1	1	/****************************************************************************
2	2	**
3		** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	3	** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
4	4	** All rights reserved.
5	5	** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qprintdialog.qdoc

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 …
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
+** $QT_BEGIN_LICENSE:FDL$
 ** Commercial Usage
 ** Licensees holding valid Qt Commercial licenses may use this file in
 ** accordance with the Qt Commercial License Agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Nokia.
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
 **
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+** GNU Free Documentation License
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of this
+** file.
 **
 ** If you have questions regarding the use of this file, please contact

trunk/src/gui/dialogs/qprintdialog_mac.mm

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 …
 #ifdef QT_MAC_USE_COCOA
 @class QCocoaPrintPanelDelegate;
 @interface QCocoaPrintPanelDelegate : NSObject {
+@class QT_MANGLE_NAMESPACE(QCocoaPrintPanelDelegate);
+@interface QT_MANGLE_NAMESPACE(QCocoaPrintPanelDelegate) : NSObject {
+}
 - (void)printPanelDidEnd:(NSPrintPanel *)printPanel
 …
 @end
 @implementation QCocoaPrintPanelDelegate
+@implementation QT_MANGLE_NAMESPACE(QCocoaPrintPanelDelegate)
 - (void)printPanelDidEnd:(NSPrintPanel *)printPanel
         returnCode:(int)returnCode contextInfo:(void *)contextInfo
 …
     QPrintDialogPrivate *d = static_cast<QPrintDialogPrivate *>(contextInfo);
     QPrintDialog *dialog = d->printDialog();
-    // temporary hack to work around bug in deleteLater() in Qt/Mac Cocoa
-#if 1
-    bool deleteDialog = dialog->testAttribute(Qt::WA_DeleteOnClose);
-    dialog->setAttribute(Qt::WA_DeleteOnClose, false);
-#endif
     if (returnCode == NSOKButton) {
 …
     dialog->done((returnCode == NSOKButton) ? QDialog::Accepted : QDialog::Rejected);
-#if 1
-    if (deleteDialog)
-        delete dialog;
-#endif
+}
 @end
 …
     macStartInterceptWindowTitle(q);
     printPanel = [NSPrintPanel printPanel];
     QCocoaPrintPanelDelegate *delegate = [[QCocoaPrintPanelDelegate alloc] init];
+    QT_MANGLE_NAMESPACE(QCocoaPrintPanelDelegate) *delegate = [[QT_MANGLE_NAMESPACE(QCocoaPrintPanelDelegate) alloc] init];
     [printPanel setOptions:macOptions];

trunk/src/gui/dialogs/qprintdialog_qws.cpp

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 …
     printer->setPageOrder(pageOrder2);
     printer->setColorMode(colorMode2);
     printer->setNumCopies(numCopies);
+    printer->setCopyCount(numCopies);
     switch ((rangeCombo->itemData(rangeCombo->currentIndex())).toInt()){
 …
         q->setPrintRange(QPrintDialog::PageRange);
         q->setFromTo(firstPage->value(), lastPage->value());
+        break;
+    case (int)QPrintDialog::CurrentPage:
+        q->setPrintRange(QPrintDialog::CurrentPage);
+        q->setFromTo(0, 0);
         break;
+    }
 …
     rangeCombo->addItem(QPrintDialog::tr("Print selection"), QPrintDialog::Selection);
     rangeCombo->addItem(QPrintDialog::tr("Print range"), QPrintDialog::PageRange);
+    rangeCombo->addItem(QPrintDialog::tr("Print current page"), QPrintDialog::CurrentPage);
     QObject::connect(rangeCombo, SIGNAL(activated(int)),
             q, SLOT(_q_printRangeSelected(int)));
 …
         // number of copies
         copies->setValue(p->numCopies());
         _q_setNumCopies(p->numCopies());
+        copies->setValue(p->copyCount());
+        _q_setNumCopies(p->copyCount());
+    }
 …
                 && rangeCombo->findData(QPrintDialog::PageRange) > 0)
             rangeCombo->removeItem(rangeCombo->findData(QPrintDialog::PageRange));
+        if (!q->isOptionEnabled(QPrintDialog::PrintCurrentPage)
+                && rangeCombo->findData(QPrintDialog::CurrentPage) > 0)
+            rangeCombo->removeItem(rangeCombo->findData(QPrintDialog::CurrentPage));
         switch (q->printRange()) {
 …
         case QPrintDialog::PageRange:
             rangeCombo->setCurrentIndex((int)(QPrintDialog::PageRange));
+            break;
+        case QPrintDialog::CurrentPage:
+            rangeCombo->setCurrentIndex((int)(QPrintDialog::CurrentPage));
             break;
+        }

trunk/src/gui/dialogs/qprintdialog_unix.cpp

-              r769
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 …
 QT_BEGIN_NAMESPACE
-extern int qt_printerRealNumCopies(QPaintEngine *);
 class QOptionTreeItem;
 class QPPDOptionsModel;
 …
         options.duplexShort->setChecked(true); break;
+    }
     options.copies->setValue(qt_printerRealNumCopies(p->paintEngine()));
+    options.copies->setValue(p->copyCount());
     options.collate->setChecked(p->collateCopies());
     options.reverse->setChecked(p->pageOrder() == QPrinter::LastPageFirst);
 …
         p->setPrintRange(QPrinter::Selection);
         p->setFromTo(0,0);
+    } else if (options.printCurrentPage->isChecked()) {
+        p->setPrintRange(QPrinter::CurrentPage);
+        p->setFromTo(0,0);
     } else if (options.printRange->isChecked()) {
         p->setPrintRange(QPrinter::PageRange);
 …
     // copies
     p->setNumCopies(options.copies->value());
+    p->setCopyCount(options.copies->value());
     p->setCollateCopies(options.collate->isChecked());
 …
     Q_Q(QPrintDialog);
     options.gbPrintRange->setVisible(q->isOptionEnabled(QPrintDialog::PrintPageRange) ||
+                                q->isOptionEnabled(QPrintDialog::PrintSelection));
+                                     q->isOptionEnabled(QPrintDialog::PrintSelection) ||
+                                     q->isOptionEnabled(QPrintDialog::PrintCurrentPage));
     options.printRange->setEnabled(q->isOptionEnabled(QPrintDialog::PrintPageRange));
     options.printSelection->setVisible(q->isOptionEnabled(QPrintDialog::PrintSelection));
+    options.printCurrentPage->setVisible(q->isOptionEnabled(QPrintDialog::PrintCurrentPage));
     options.collate->setVisible(q->isOptionEnabled(QPrintDialog::PrintCollateCopies));
 …
         options.printRange->setChecked(true);
         break;
+    case QPrintDialog::CurrentPage:
+        if (q->isOptionEnabled(QPrintDialog::PrintCurrentPage))
+            options.printCurrentPage->setChecked(true);
+        break;
     default:
         break;
 …
 #endif
 #ifndef QT_NO_FILESYSTEMMODEL
+#if !defined(QT_NO_FILESYSTEMMODEL) && !defined(QT_NO_COMPLETER)
     QFileSystemModel *fsm = new QFileSystemModel(widget.filename);
     fsm->setRootPath(QDir::homePath());
+#if !defined(QT_NO_FSCOMPLETER) && !defined(QT_NO_FILEDIALOG)
+    widget.filename->setCompleter(new QFSCompleter(fsm, widget.filename));
+#endif
+    widget.filename->setCompleter(new QCompleter(fsm, widget.filename));
 #endif
     _q_printerChanged(currentPrinterIndex);

trunk/src/gui/dialogs/qprintdialog_win.cpp

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 …
 #include <private/qprinter_p.h>
 #if defined(Q_CC_MINGW) && !defined(PD_NOCURRENTPAGE)
+#if !defined(PD_NOCURRENTPAGE)
 #define PD_NOCURRENTPAGE    0x00800000
 #define PD_RESULT_PRINT 1
 …
         pd->Flags |= PD_NOPAGENUMS;
+    // we don't have a 'current page' notion in the QPrinter API yet.
+    // Neither do we support more than one page range, so limit those
+    // options
+    pd->Flags |= PD_NOCURRENTPAGE;
+    // Disable Current Page option if not required as default is Enabled
+    if (!pdlg->isOptionEnabled(QPrintDialog::PrintCurrentPage))
+        pd->Flags |= PD_NOCURRENTPAGE;
+    // Default to showing the General tab first
     pd->nStartPage = START_PAGE_GENERAL;
+    // We don't support more than one page range in the QPrinter API yet.
     pd->nPageRanges = 1;
     pd->nMaxPageRanges = 1;
 …
     if (d->ep->printToFile)
         pd->Flags |= PD_PRINTTOFILE;
     Q_ASSERT(parent != 0 && parent->testAttribute(Qt::WA_WState_Created));
+    Q_ASSERT(parent);
     pd->hwndOwner = parent->window()->winId();
     pd->lpPageRanges[0].nFromPage = qMax(pdlg->fromPage(), pdlg->minPage());
 …
         pdlg->setPrintRange(QPrintDialog::PageRange);
         pdlg->setFromTo(pd->lpPageRanges[0].nFromPage, pd->lpPageRanges[0].nToPage);
+    } else {
+    } else if (pd->Flags & PD_CURRENTPAGE) {
+        pdlg->setPrintRange(QPrintDialog::CurrentPage);
+        pdlg->setFromTo(0, 0);
+    } else { // PD_ALLPAGES
         pdlg->setPrintRange(QPrintDialog::AllPages);
         pdlg->setFromTo(0, 0);

trunk/src/gui/dialogs/qprintpreviewdialog.cpp

-              r769
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 …
     \endlist
+    In Symbian, there is no support for printing. Hence, this dialog should not
+    be used in Symbian.
     \sa QPrinter, QPrintDialog, QPageSetupDialog, QPrintPreviewWidget

trunk/src/gui/dialogs/qprintpreviewdialog.h

r651	r846
1	1	/****************************************************************************
2	2	**
3		** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	3	** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
4	4	** All rights reserved.
5	5	** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qprintsettingsoutput.ui

-              r2
+              r846
+<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>QPrintSettingsOutput</class>
  <widget class="QWidget" name="QPrintSettingsOutput" >
   <property name="geometry" >
+ <widget class="QWidget" name="QPrintSettingsOutput">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>416</width>
     <height>166</height>
+    <width>426</width>
+    <height>171</height>
    </rect>
   </property>
   <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Form</string>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout_2" >
    <property name="margin" >
+  <layout class="QHBoxLayout" name="horizontalLayout_2">
+   <property name="margin">
     <number>0</number>
    </property>
    <item>
     <widget class="QTabWidget" name="tabs" >
      <property name="currentIndex" >
+    <widget class="QTabWidget" name="tabs">
+     <property name="currentIndex">
       <number>0</number>
      </property>
+     <widget class="QWidget" name="copiesTab" >
+      <property name="geometry" >
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>412</width>
+        <height>139</height>
+       </rect>
+      </property>
+      <attribute name="title" >
+     <widget class="QWidget" name="copiesTab">
+      <attribute name="title">
        <string>Copies</string>
       </attribute>
       <layout class="QHBoxLayout" name="horizontalLayout" >
+      <layout class="QHBoxLayout" name="horizontalLayout">
        <item>
         <widget class="QGroupBox" name="gbPrintRange" >
          <property name="sizePolicy" >
           <sizepolicy vsizetype="Minimum" hsizetype="Preferred" >
+        <widget class="QGroupBox" name="gbPrintRange">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="title" >
+         <property name="title">
           <string>Print range</string>
          </property>
          <layout class="QVBoxLayout" name="_3" >
           <property name="spacing" >
+         <layout class="QVBoxLayout" name="_3">
+          <property name="spacing">
            <number>4</number>
           </property>
           <property name="margin" >
+          <property name="margin">
            <number>6</number>
           </property>
           <item>
            <widget class="QRadioButton" name="printAll" >
             <property name="text" >
+           <widget class="QRadioButton" name="printAll">
+            <property name="text">
              <string>Print all</string>
             </property>
             <property name="checked" >
+            <property name="checked">
              <bool>true</bool>
             </property>
 …
           </item>
           <item>
            <layout class="QHBoxLayout" name="_4" >
             <property name="spacing" >
+           <layout class="QHBoxLayout" name="_4">
+            <property name="spacing">
              <number>6</number>
             </property>
             <property name="margin" >
+            <property name="margin">
              <number>0</number>
             </property>
             <item>
              <widget class="QRadioButton" name="printRange" >
               <property name="text" >
+             <widget class="QRadioButton" name="printRange">
+              <property name="text">
                <string>Pages from</string>
               </property>
 …
             </item>
             <item>
              <widget class="QSpinBox" name="from" >
               <property name="enabled" >
+             <widget class="QSpinBox" name="from">
+              <property name="enabled">
                <bool>false</bool>
               </property>
               <property name="minimum" >
+              <property name="minimum">
                <number>1</number>
               </property>
               <property name="maximum" >
+              <property name="maximum">
                <number>999</number>
               </property>
 …
             </item>
             <item>
              <widget class="QLabel" name="label_3" >
               <property name="text" >
+             <widget class="QLabel" name="label_3">
+              <property name="text">
                <string>to</string>
               </property>
 …
             </item>
             <item>
              <widget class="QSpinBox" name="to" >
               <property name="enabled" >
+             <widget class="QSpinBox" name="to">
+              <property name="enabled">
                <bool>false</bool>
               </property>
               <property name="minimum" >
+              <property name="minimum">
                <number>1</number>
               </property>
               <property name="maximum" >
+              <property name="maximum">
                <number>999</number>
               </property>
 …
             <item>
              <spacer>
               <property name="orientation" >
+              <property name="orientation">
                <enum>Qt::Horizontal</enum>
               </property>
               <property name="sizeHint" stdset="0" >
+              <property name="sizeHint" stdset="0">
                <size>
                 <width>0</width>
 …
           </item>
           <item>
+           <widget class="QRadioButton" name="printSelection" >
+            <property name="text" >
+           <widget class="QRadioButton" name="printCurrentPage">
+            <property name="text">
+             <string>Current Page</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QRadioButton" name="printSelection">
+            <property name="text">
              <string>Selection</string>
             </property>
 …
           </item>
           <item>
            <spacer name="verticalSpacer" >
             <property name="orientation" >
+           <spacer name="verticalSpacer">
+            <property name="orientation">
              <enum>Qt::Vertical</enum>
             </property>
             <property name="sizeHint" stdset="0" >
+            <property name="sizeHint" stdset="0">
              <size>
               <width>1</width>
 …
        </item>
        <item>
         <widget class="QGroupBox" name="groupBox" >
          <property name="title" >
+        <widget class="QGroupBox" name="groupBox">
+         <property name="title">
           <string>Output Settings</string>
          </property>
          <layout class="QGridLayout" name="gridLayout" >
           <item row="0" column="0" >
            <widget class="QLabel" name="label" >
             <property name="text" >
+         <layout class="QGridLayout" name="gridLayout">
+          <item row="0" column="0">
+           <widget class="QLabel" name="label">
+            <property name="text">
              <string>Copies:</string>
             </property>
             <property name="buddy" >
+            <property name="buddy">
              <cstring>copies</cstring>
             </property>
            </widget>
           </item>
           <item row="0" column="1" colspan="2" >
            <widget class="QSpinBox" name="copies" >
             <property name="minimum" >
+          <item row="0" column="1" colspan="2">
+           <widget class="QSpinBox" name="copies">
+            <property name="minimum">
              <number>1</number>
             </property>
             <property name="maximum" >
+            <property name="maximum">
              <number>999</number>
             </property>
            </widget>
           </item>
           <item row="0" column="3" >
            <spacer name="horizontalSpacer" >
             <property name="orientation" >
+          <item row="0" column="3">
+           <spacer name="horizontalSpacer">
+            <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
             <property name="sizeHint" stdset="0" >
+            <property name="sizeHint" stdset="0">
              <size>
               <width>91</width>
 …
            </spacer>
           </item>
           <item row="1" column="0" colspan="2" >
            <widget class="QCheckBox" name="collate" >
             <property name="text" >
+          <item row="1" column="0" colspan="2">
+           <widget class="QCheckBox" name="collate">
+            <property name="text">
              <string>Collate</string>
             </property>
            </widget>
           </item>
           <item rowspan="2" row="1" column="2" colspan="2" >
            <widget class="QLabel" name="outputIcon" >
             <property name="sizePolicy" >
              <sizepolicy vsizetype="Ignored" hsizetype="Ignored" >
+          <item row="1" column="2" rowspan="2" colspan="2">
+           <widget class="QLabel" name="outputIcon">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Ignored" vsizetype="Ignored">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
 …
            </widget>
           </item>
           <item row="2" column="0" colspan="2" >
            <widget class="QCheckBox" name="reverse" >
             <property name="text" >
+          <item row="2" column="0" colspan="2">
+           <widget class="QCheckBox" name="reverse">
+            <property name="text">
              <string>Reverse</string>
             </property>
            </widget>
           </item>
           <item row="3" column="0" colspan="4" >
            <spacer name="verticalSpacer_2" >
             <property name="orientation" >
+          <item row="3" column="0" colspan="4">
+           <spacer name="verticalSpacer_2">
+            <property name="orientation">
              <enum>Qt::Vertical</enum>
             </property>
             <property name="sizeHint" stdset="0" >
+            <property name="sizeHint" stdset="0">
              <size>
               <width>0</width>
 …
       </layout>
      </widget>
+     <widget class="QWidget" name="optionsTab" >
+      <property name="geometry" >
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>412</width>
+        <height>139</height>
+       </rect>
+      </property>
+      <attribute name="title" >
+     <widget class="QWidget" name="optionsTab">
+      <attribute name="title">
        <string>Options</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_2" >
        <item row="0" column="1" >
         <widget class="QGroupBox" name="colorMode" >
          <property name="title" >
+      <layout class="QGridLayout" name="gridLayout_2">
+       <item row="0" column="1">
+        <widget class="QGroupBox" name="colorMode">
+         <property name="title">
           <string>Color Mode</string>
          </property>
          <layout class="QGridLayout" name="gridLayout_4" >
           <item row="2" column="0" >
            <spacer name="verticalSpacer_6" >
             <property name="orientation" >
+         <layout class="QGridLayout" name="gridLayout_4">
+          <item row="2" column="0">
+           <spacer name="verticalSpacer_6">
+            <property name="orientation">
              <enum>Qt::Vertical</enum>
             </property>
             <property name="sizeHint" stdset="0" >
+            <property name="sizeHint" stdset="0">
              <size>
               <width>1</width>
 …
            </spacer>
           </item>
           <item row="0" column="0" >
            <widget class="QRadioButton" name="color" >
             <property name="text" >
+          <item row="0" column="0">
+           <widget class="QRadioButton" name="color">
+            <property name="text">
              <string>Color</string>
             </property>
            </widget>
           </item>
           <item rowspan="3" row="0" column="1" >
            <widget class="QLabel" name="colorIcon" />
           </item>
           <item row="1" column="0" >
            <widget class="QRadioButton" name="grayscale" >
             <property name="text" >
+          <item row="0" column="1" rowspan="3">
+           <widget class="QLabel" name="colorIcon"/>
+          </item>
+          <item row="1" column="0">
+           <widget class="QRadioButton" name="grayscale">
+            <property name="text">
              <string>Grayscale</string>
             </property>
 …
         </widget>
        </item>
        <item row="0" column="0" >
         <widget class="QGroupBox" name="duplex" >
          <property name="title" >
+       <item row="0" column="0">
+        <widget class="QGroupBox" name="duplex">
+         <property name="title">
           <string>Duplex Printing</string>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout" >
           <item>
            <widget class="QRadioButton" name="noDuplex" >
             <property name="text" >
+         <layout class="QVBoxLayout" name="verticalLayout">
+          <item>
+           <widget class="QRadioButton" name="noDuplex">
+            <property name="text">
              <string>None</string>
             </property>
             <property name="checked" >
+            <property name="checked">
              <bool>true</bool>
             </property>
 …
           </item>
           <item>
            <widget class="QRadioButton" name="duplexLong" >
             <property name="text" >
+           <widget class="QRadioButton" name="duplexLong">
+            <property name="text">
              <string>Long side</string>
             </property>
 …
           </item>
           <item>
            <widget class="QRadioButton" name="duplexShort" >
             <property name="text" >
+           <widget class="QRadioButton" name="duplexShort">
+            <property name="text">
              <string>Short side</string>
             </property>
 …
           </item>
           <item>
            <spacer name="verticalSpacer_42" >
             <property name="orientation" >
+           <spacer name="verticalSpacer_42">
+            <property name="orientation">
              <enum>Qt::Vertical</enum>
             </property>
             <property name="sizeHint" stdset="0" >
+            <property name="sizeHint" stdset="0">
              <size>
               <width>1</width>
 …
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>76</x>
      <y>59</y>
     </hint>
     <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>122</x>
      <y>57</y>
 …
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>69</x>
      <y>67</y>
     </hint>
     <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>215</x>
      <y>67</y>

trunk/src/gui/dialogs/qprogressdialog.cpp

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 …
 #include "qpainter.h"
 #include "qdrawutil.h"
-#include "qdatetime.h"
 #include "qlabel.h"
 #include "qprogressbar.h"
 …
 #include "qcursor.h"
 #include "qtimer.h"
+#include "qelapsedtimer.h"
 #include <private/qdialog_p.h>
 #include <limits.h>
 …
     bool shown_once;
     bool cancellation_flag;
     QTime starttime;
+    QElapsedTimer starttime;
 #ifndef QT_NO_CURSOR
     QCursor parentCursor;
 …
         bool(q->style()->styleHint(QStyle::SH_ProgressDialog_CenterCancelButton, 0, q));
+    int additionalSpacing = 0;
+#ifdef Q_OS_SYMBIAN
+    //In Symbian, we need to have wider margins for dialog borders, as the actual border is some pixels
+    //inside the dialog area (to enable transparent borders)
+    additionalSpacing = mlr;
+#endif
     QSize cs = cancel ? cancel->sizeHint() : QSize(0,0);
     QSize bh = bar->sizeHint();
 …
     if (label)
         label->setGeometry(mlr, 0, q->width()-mlr*2, lh);
     bar->setGeometry(mlr, lh+sp, q->width()-mlr*2, bh.height());
+        label->setGeometry(mlr, additionalSpacing, q->width() - mlr * 2, lh);
+    bar->setGeometry(mlr, lh + sp + additionalSpacing, q->width() - mlr * 2, bh.height());
+}

trunk/src/gui/dialogs/qprogressdialog.h

r651	r846
1	1	/****************************************************************************
2	2	**
3		** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	3	** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
4	4	** All rights reserved.
5	5	** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qsidebar.cpp

r766	r846
1	1	/****************************************************************************
2	2	**
3		** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	3	** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
4	4	** All rights reserved.
5	5	** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qsidebar_p.h

r765	r846
1	1	/****************************************************************************
2	2	**
3		** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	3	** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
4	4	** All rights reserved.
5	5	** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qwizard.cpp

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 …
       topLevelMarginBottom(-1), childMarginLeft(-1), childMarginRight(-1),
       childMarginTop(-1), childMarginBottom(-1), hspacing(-1), vspacing(-1),
           wizStyle(QWizard::ClassicStyle), header(false), watermark(false), title(false),
           subTitle(false), extension(false) {}
+      wizStyle(QWizard::ClassicStyle), header(false), watermark(false), title(false),
+      subTitle(false), extension(false), sideWidget(false) {}
     int topLevelMarginLeft;
 …
     bool subTitle;
     bool extension;
+    bool sideWidget;
     bool operator==(const QWizardLayoutInfo &other);
 …
            && title == other.title
            && subTitle == other.subTitle
+           && extension == other.extension;
+           && extension == other.extension
+           && sideWidget == other.sideWidget;
+}
 …
 };
+class QWatermarkLabel : public QLabel
+{
+public:
+    QWatermarkLabel(QWidget *parent, QWidget *sideWidget) : QLabel(parent), m_sideWidget(sideWidget) {
+        m_layout = new QVBoxLayout(this);
+        if (m_sideWidget)
+            m_layout->addWidget(m_sideWidget);
+    }
+    QSize minimumSizeHint() const {
+        if (!pixmap() && !pixmap()->isNull())
+            return pixmap()->size();
+        return QFrame::minimumSizeHint();
+    }
+    void setSideWidget(QWidget *widget) {
+        if (m_sideWidget == widget)
+            return;
+        if (m_sideWidget) {
+            m_layout->removeWidget(m_sideWidget);
+            m_sideWidget->hide();
+        }
+        m_sideWidget = widget;
+        if (m_sideWidget)
+            m_layout->addWidget(m_sideWidget);
+    }
+    QWidget *sideWidget() const {
+        return m_sideWidget;
+    }
+private:
+    QVBoxLayout *m_layout;
+    QWidget *m_sideWidget;
+};
 class QWizardPagePrivate : public QWidgetPrivate
+{
 …
     inline QWizardPrivate()
         : start(-1)
+        , startSetByUser(false)
         , current(-1)
         , canContinue(false)
 …
         , headerWidget(0)
         , watermarkLabel(0)
+        , sideWidget(0)
         , titleLabel(0)
         , subTitleLabel(0)
 …
     QSet<int> initialized; // ### remove and move bit to QWizardPage?
     int start;
+    bool startSetByUser;
     int current;
     bool canContinue;
 …
     QWidget *placeholderWidget2;
     QWizardHeader *headerWidget;
+    QLabel *watermarkLabel;
+    QWatermarkLabel *watermarkLabel;
+    QWidget *sideWidget;
     QFrame *pageFrame;
     QLabel *titleLabel;
 …
     info.header = (info.wizStyle == QWizard::ClassicStyle || info.wizStyle == QWizard::ModernStyle)
         && !(opts & QWizard::IgnoreSubTitles) && !subTitleText.isEmpty();
+    info.sideWidget = sideWidget;
     info.watermark = (info.wizStyle != QWizard::MacStyle) && (info.wizStyle != QWizard::AeroStyle)
         && !watermarkPixmap.isNull();
     info.title = !info.header && !titleText.isEmpty();
     info.subTitle = !(opts & QWizard::IgnoreSubTitles) && !info.header && !subTitleText.isEmpty();
     info.extension = info.watermark && (opts & QWizard::ExtendedWatermarkPixmap);
+    info.extension = (info.watermark || info.sideWidget) && (opts & QWizard::ExtendedWatermarkPixmap);
     return info;
 …
     if (mac) {
         numColumns = 3;
     } else if (info.watermark) {
+    } else if (info.watermark || info.sideWidget) {
         numColumns = 2;
     } else {
 …
+    }
     if (info.watermark && !watermarkLabel) {
         watermarkLabel = new QLabel(antiFlickerWidget);
+    if ((info.watermark || info.sideWidget) && !watermarkLabel) {
+        watermarkLabel = new QWatermarkLabel(antiFlickerWidget, sideWidget);
         watermarkLabel->setBackgroundRole(QPalette::Base);
         watermarkLabel->setMinimumHeight(1);
 …
     mainLayout->addLayout(buttonLayout, row++, buttonStartColumn, 1, buttonNumColumns);
     if (info.watermark) {
+    if (info.watermark || info.sideWidget) {
         if (info.extension)
             watermarkEndRow = row;
 …
         bottomRuler->setVisible(classic || modern);
     if (watermarkLabel)
         watermarkLabel->setVisible(info.watermark);
+        watermarkLabel->setVisible(info.watermark || info.sideWidget);
     layoutInfo = info;
 …
+    }
+    if (info.watermark) {
+        Q_ASSERT(page);
+        watermarkLabel->setPixmap(page->pixmap(QWizard::WatermarkPixmap));
+    }
+    if (info.watermark || info.sideWidget) {
+        QPixmap pix;
+        if (info.watermark) {
+            if (page)
+                pix = page->pixmap(QWizard::WatermarkPixmap);
+            else
+                pix = q->pixmap(QWizard::WatermarkPixmap);
+        }
+        watermarkLabel->setPixmap(pix); // in case there is no watermark and we show the side widget we need to clear the watermark
+    }
     if (info.title) {
         Q_ASSERT(page);
 …
         maximumSize.setWidth(headerWidget->maximumWidth());
+    }
     if (info.watermark) {
+    if (info.watermark && !info.sideWidget) {
         minimumSize.setHeight(mainLayout->totalSizeHint().height());
         maximumSize.setHeight(mainLayout->totalSizeHint().height());
 …
     QWizard so far.
     \sa setPage(), page()
+    \sa setPage(), page(), pageAdded()
 */
 int QWizard::addPage(QWizardPage *page)
 …
     Adds the given \a page to the wizard with the given \a id.
+    \sa addPage(), page()
+    \note Adding a page may influence the value of the startId property
+    in case it was not set explicitly.
+    \sa addPage(), page(), pageAdded()
 */
 void QWizard::setPage(int theid, QWizardPage *page)
 …
     page->hide();
     d->pageVBoxLayout->setEnabled(pageVBoxLayoutEnabled);
+    if (!d->startSetByUser && d->pageMap.constBegin().key() == theid)
+        d->start = theid;
+    emit pageAdded(theid);
+}
 /*!
     Removes the page with the given \a id. cleanupPage() will be called if necessary.
+    \note Removing a page may influence the value of the startId property.
     \since 4.5
     \sa addPage(), setPage()
+    \sa addPage(), setPage(), pageRemoved(), startId()
 */
 void QWizard::removePage(int id)
 …
     QWizardPage *removedPage = 0;
+    if (d->start == id)
+        d->start = -1;
+    // update startItem accordingly
+    if (d->pageMap.count() > 0) { // only if we have any pages
+        if (d->start == id) {
+            const int firstId = d->pageMap.constBegin().key();
+            if (firstId == id) {
+                if (d->pageMap.count() > 1)
+                    d->start = (++d->pageMap.constBegin()).key(); // secondId
+                else
+                    d->start = -1; // removing the last page
+            } else { // startSetByUser has to be "true" here
+                d->start = firstId;
+            }
+            d->startSetByUser = false;
+        }
+    }
+    if (d->pageMap.contains(id))
+        emit pageRemoved(id);
     if (!d->history.contains(id)) {
 …
+{
     Q_D(QWizard);
+    if (!d->pageMap.contains(theid)) {
+        qWarning("QWizard::setStartId: Invalid page ID %d", theid);
+    int newStart = theid;
+    if (theid == -1)
+        newStart = d->pageMap.count() ? d->pageMap.constBegin().key() : -1;
+    if (d->start == newStart) {
+        d->startSetByUser = theid != -1;
         return;
+    }
+    d->start = theid;
+    if (!d->pageMap.contains(newStart)) {
+        qWarning("QWizard::setStartId: Invalid page ID %d", newStart);
+        return;
+    }
+    d->start = newStart;
+    d->startSetByUser = theid != -1;
+}
 …
+{
     Q_D(const QWizard);
+    if (d->start != -1)
+        return d->start;
+    if (!d->pageMap.isEmpty())
+        return d->pageMap.constBegin().key();
+    return -1;
+    return d->start;
+}
 …
 /*!
+    \since 4.7
+    Sets the given \a widget to be shown on the left side of the wizard.
+    For styles which use the WatermarkPixmap (ClassicStyle and ModernStyle)
+    the side widget is displayed on top of the watermark, for other styles
+    or when the watermark is not provided the side widget is displayed
+    on the left side of the wizard.
+    Passing 0 shows no side widget.
+    When the \a widget is not 0 the wizard reparents it.
+    Any previous side widget is hidden.
+    You may call setSideWidget() with the same widget at different
+    times.
+    All widgets set here will be deleted by the wizard when it is
+    destroyed unless you separately reparent the widget after setting
+    some other side widget (or 0).
+    By default, no side widget is present.
+*/
+void QWizard::setSideWidget(QWidget *widget)
+{
+    Q_D(QWizard);
+    d->sideWidget = widget;
+    if (d->watermarkLabel) {
+        d->watermarkLabel->setSideWidget(widget);
+        d->updateLayout();
+    }
+}
+/*!
+    \since 4.7
+    Returns the widget on the left side of the wizard or 0.
+    By default, no side widget is present.
+*/
+QWidget *QWizard::sideWidget() const
+{
+    Q_D(const QWizard);
+    return d->sideWidget;
+}
+/*!
     \reimp
 */
 …
     \sa currentId(), currentPage()
+*/
+/*!
+    \fn void QWizard::pageAdded(int id)
+    \since 4.7
+    This signal is emitted whenever a page is added to the
+    wizard. The page's \a id is passed as parameter.
+    \sa addPage(), setPage(), startId()
+*/
+/*!
+    \fn void QWizard::pageRemoved(int id)
+    \since 4.7
+    This signal is emitted whenever a page is removed from the
+    wizard. The page's \a id is passed as parameter.
+    \sa removePage(), startId()
 */

trunk/src/gui/dialogs/qwizard.h

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 …
     QPixmap pixmap(WizardPixmap which) const;
+    void setSideWidget(QWidget *widget);
+    QWidget *sideWidget() const;
     void setDefaultProperty(const char *className, const char *property,
                             const char *changedSignal);
 …
     void helpRequested();
     void customButtonClicked(int which);
+    void pageAdded(int id);
+    void pageRemoved(int id);
 public Q_SLOTS:

trunk/src/gui/dialogs/qwizard_win.cpp

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 …
 #include "qwizard_win_p.h"
 #include "qlibrary.h"
+#include <private/qsystemlibrary_p.h>
 #include "qwizard.h"
 #include "qpaintengine.h"
 …
+{
     ensurePolished();
+    int width = 32, height = 32;
+    int size = int(QStyleHelper::dpiScaled(32));
+    int width = size, height = size;
 /*
     HANDLE theme = pOpenThemeData(0, L"Navigation");
 …
     //RECT rect;
     RECT clipRect;
     int xoffset = QWidget::mapToParent(r.topLeft()).x();
     int yoffset = QWidget::mapToParent(r.topLeft()).y();
+    int xoffset = QWidget::mapToParent(r.topLeft()).x() - 1;
+    int yoffset = QWidget::mapToParent(r.topLeft()).y() - 1;
     clipRect.top = r.top() + yoffset;
 …
 QVistaHelper::QVistaHelper(QWizard *wizard)
+    : pressed(false)
+    : QObject(wizard)
+    , pressed(false)
     , wizard(wizard)
     , backButton_(0)
 …
     if (is_vista)
         backButton_ = new QVistaBackButton(wizard);
+    // Handle diff between Windows 7 and Vista
+    iconSpacing = QStyleHelper::dpiScaled(7);
+    textSpacing = QSysInfo::WindowsVersion >= QSysInfo::WV_WINDOWS7 ?
+                  iconSpacing : QStyleHelper::dpiScaled(20);
+}
 …
 void QVistaHelper::drawTitleBar(QPainter *painter)
+{
+    HDC hdc = painter->paintEngine()->getDC();
     if (vistaState() == VistaAero)
+        drawBlackRect(
+            QRect(0, 0, wizard->width(), titleBarSize() + topOffset()),
+            painter->paintEngine()->getDC());
+        drawBlackRect(QRect(0, 0, wizard->width(),
+                            titleBarSize() + topOffset()), hdc);
     Q_ASSERT(backButton_);
     const int btnTop = backButton_->mapToParent(QPoint()).y();
     const int btnHeight = backButton_->size().height();
+    const int verticalCenter = (btnTop + btnHeight / 2);
+    wizard->windowIcon().paint(
+        painter, QRect(leftMargin(), verticalCenter - iconSize() / 2, iconSize(), iconSize()));
+    const int verticalCenter = (btnTop + btnHeight / 2) - 1;
     const QString text = wizard->window()->windowTitle();
 …
     int textHeight = brect.height();
     int textWidth = brect.width();
+    int glowOffset = 0;
     if (vistaState() == VistaAero) {
         textHeight += 2 * glowSize();
         textWidth += 2 * glowSize();
+    }
+        glowOffset = glowSize();
+    }
     drawTitleText(
         painter, text,
+        QRect(titleOffset(), verticalCenter - textHeight / 2, textWidth, textHeight),
+        painter->paintEngine()->getDC());
+        QRect(titleOffset() - glowOffset, verticalCenter - textHeight / 2, textWidth, textHeight),
+        hdc);
+    if (!wizard->windowIcon().isNull()) {
+        QRect rect(leftMargin(), verticalCenter - iconSize() / 2, iconSize(), iconSize());
+        HICON hIcon = wizard->windowIcon().pixmap(iconSize()).toWinHICON();
+        DrawIconEx(hdc, rect.left(), rect.top(), hIcon, 0, 0, 0, NULL, DI_NORMAL | DI_COMPAT);
+        DestroyIcon(hIcon);
+    }
+}
 …
     if (!tried) {
         tried = true;
         QLibrary dwmLib(QString::fromAscii("dwmapi"));
+        QSystemLibrary dwmLib(L"dwmapi");
         pDwmIsCompositionEnabled =
             (PtrDwmIsCompositionEnabled)dwmLib.resolve("DwmIsCompositionEnabled");
 …
                 (PtrDwmExtendFrameIntoClientArea)dwmLib.resolve("DwmExtendFrameIntoClientArea");
+        }
         QLibrary themeLib(QString::fromAscii("uxtheme"));
+        QSystemLibrary themeLib(L"uxtheme");
         pIsAppThemed = (PtrIsAppThemed)themeLib.resolve("IsAppThemed");
         if (pIsAppThemed) {
 …
 int QVistaHelper::titleOffset()
+{
     int iconOffset = wizard ->windowIcon().isNull() ? 0 : iconSize() + padding();
+    int iconOffset = wizard ->windowIcon().isNull() ? 0 : iconSize() + textSpacing;
     return leftMargin() + iconOffset;
+}

trunk/src/gui/dialogs/qwizard_win_p.h

-              r651
+              r846
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 …
 #include <qabstractbutton.h>
 #include <QtGui/private/qwidget_p.h>
+#include <QtGui/private/qstylehelper_p.h>
 QT_BEGIN_NAMESPACE
 …
 class QVistaHelper : public QObject
+{
-    Q_OBJECT
 public:
     QVistaHelper(QWizard *wizard);
 …
     static VistaState vistaState();
     static int titleBarSize() { return frameSize() + captionSize(); }
+    static int topPadding() { return 8; }
+    static int topOffset() { return titleBarSize() + (vistaState() == VistaAero ? 13 : 3); }
+    static int topPadding() { // padding under text
+        return int(QStyleHelper::dpiScaled(
+                QSysInfo::WindowsVersion >= QSysInfo::WV_WINDOWS7 ? 4 : 6));
+    }
+    static int topOffset() {
+        static int aeroOffset = QSysInfo::WindowsVersion >= QSysInfo::WV_WINDOWS7 ?
+                                QStyleHelper::dpiScaled(4) : QStyleHelper::dpiScaled(13);
+        return (titleBarSize() + (vistaState() == VistaAero ? aeroOffset : 3)); }
 private:
     static HFONT getCaptionFont(HANDLE hTheme);
 …
     static int captionSize() { return GetSystemMetrics(SM_CYCAPTION); }
     static int backButtonSize() { return 31; } // ### should be queried from back button itself
+    static int backButtonSize() { return int(QStyleHelper::dpiScaled(30)); }
     static int iconSize() { return 16; } // Standard Aero
-    static int padding() { return 7; } // Standard Aero
-    static int leftMargin() { return backButtonSize() + padding(); }
     static int glowSize() { return 10; }
+    int leftMargin() { return backButton_->isVisible() ? backButtonSize() + iconSpacing : 0; }
     int titleOffset();
 …
     QWizard *wizard;
     QVistaBackButton *backButton_;
+    int titleBarOffset;  // Extra spacing above the text
+    int iconSpacing;    // Space between button and icon
+    int textSpacing;    // Space between icon and text
 };

/branches/vendor/nokia/qt/4.7.2 (added)	merged: 845
/branches/vendor/nokia/qt/current	merged: 844
/branches/vendor/nokia/qt/4.6.3	removed

Context Navigation

Legend:

Download in other formats: