Changeset 651 for trunk/src/gui/dialogs

Timestamp:

Mar 8, 2010, 12:52:58 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.2 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/dialogs/qabstractpagesetupdialog.cpp (modified) (1 diff)
• src/gui/dialogs/qabstractpagesetupdialog.h (modified) (1 diff)
• src/gui/dialogs/qabstractpagesetupdialog_p.h (modified) (1 diff)
• src/gui/dialogs/qabstractprintdialog.cpp (modified) (1 diff)
• src/gui/dialogs/qabstractprintdialog.h (modified) (1 diff)
• src/gui/dialogs/qabstractprintdialog_p.h (modified) (1 diff)
• src/gui/dialogs/qcolordialog.cpp (modified) (17 diffs)
• src/gui/dialogs/qcolordialog.h (modified) (1 diff)
• src/gui/dialogs/qcolordialog_mac.mm (modified) (2 diffs)
• src/gui/dialogs/qcolordialog_p.h (modified) (1 diff)
• src/gui/dialogs/qdialog.cpp (modified) (3 diffs)
• src/gui/dialogs/qdialog.h (modified) (1 diff)
• src/gui/dialogs/qdialog_p.h (modified) (1 diff)
• src/gui/dialogs/qdialogsbinarycompat_win.cpp (modified) (1 diff)
• src/gui/dialogs/qerrormessage.cpp (modified) (1 diff)
• src/gui/dialogs/qerrormessage.h (modified) (1 diff)
• src/gui/dialogs/qfiledialog.cpp (modified) (10 diffs)
• src/gui/dialogs/qfiledialog.h (modified) (1 diff)
• src/gui/dialogs/qfiledialog.ui (modified) (1 diff)
• src/gui/dialogs/qfiledialog_embedded.ui (modified) (1 diff)
• src/gui/dialogs/qfiledialog_mac.mm (modified) (2 diffs)
• src/gui/dialogs/qfiledialog_p.h (modified) (1 diff)
• src/gui/dialogs/qfiledialog_win.cpp (modified) (1 diff)
• src/gui/dialogs/qfileinfogatherer.cpp (modified) (1 diff)
• src/gui/dialogs/qfileinfogatherer_p.h (modified) (1 diff)
• src/gui/dialogs/qfilesystemmodel.cpp (modified) (3 diffs)
• src/gui/dialogs/qfilesystemmodel.h (modified) (1 diff)
• src/gui/dialogs/qfilesystemmodel_p.h (modified) (2 diffs)
• src/gui/dialogs/qfontdialog.cpp (modified) (1 diff)
• src/gui/dialogs/qfontdialog.h (modified) (1 diff)
• src/gui/dialogs/qfontdialog_mac.mm (modified) (1 diff)
• src/gui/dialogs/qfontdialog_p.h (modified) (1 diff)
• src/gui/dialogs/qfscompleter_p.h (modified) (1 diff)
• src/gui/dialogs/qinputdialog.cpp (modified) (1 diff)
• src/gui/dialogs/qinputdialog.h (modified) (1 diff)
• src/gui/dialogs/qmessagebox.cpp (modified) (6 diffs)
• src/gui/dialogs/qmessagebox.h (modified) (1 diff)
• src/gui/dialogs/qnspanelproxy_mac.mm (modified) (1 diff)
• src/gui/dialogs/qpagesetupdialog.cpp (modified) (1 diff)
• src/gui/dialogs/qpagesetupdialog.h (modified) (1 diff)
• src/gui/dialogs/qpagesetupdialog_mac.mm (modified) (1 diff)
• src/gui/dialogs/qpagesetupdialog_unix.cpp (modified) (1 diff)
• src/gui/dialogs/qpagesetupdialog_unix_p.h (modified) (1 diff)
• src/gui/dialogs/qpagesetupdialog_win.cpp (modified) (1 diff)
• src/gui/dialogs/qprintdialog.h (modified) (1 diff)
• src/gui/dialogs/qprintdialog.qdoc (modified) (1 diff)
• src/gui/dialogs/qprintdialog_mac.mm (modified) (1 diff)
• src/gui/dialogs/qprintdialog_qws.cpp (modified) (1 diff)
• src/gui/dialogs/qprintdialog_unix.cpp (modified) (1 diff)
• src/gui/dialogs/qprintdialog_win.cpp (modified) (1 diff)
• src/gui/dialogs/qprintpreviewdialog.cpp (modified) (4 diffs)
• src/gui/dialogs/qprintpreviewdialog.h (modified) (1 diff)
• src/gui/dialogs/qprogressdialog.cpp (modified) (1 diff)
• src/gui/dialogs/qprogressdialog.h (modified) (1 diff)
• src/gui/dialogs/qsidebar.cpp (modified) (1 diff)
• src/gui/dialogs/qsidebar_p.h (modified) (1 diff)
• src/gui/dialogs/qwizard.cpp (modified) (1 diff)
• src/gui/dialogs/qwizard.h (modified) (1 diff)
• src/gui/dialogs/qwizard_win.cpp (modified) (1 diff)
• src/gui/dialogs/qwizard_win_p.h (modified) (1 diff)

trunk/src/gui/dialogs/qabstractpagesetupdialog.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qabstractpagesetupdialog.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qabstractpagesetupdialog_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qabstractprintdialog.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qabstractprintdialog.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qabstractprintdialog_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qcolordialog.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -69 +69 @@
 #endif
 
+#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5)
+#  define QT_SMALL_COLORDIALOG
+#endif
+
 QT_BEGIN_NAMESPACE
 
@@ -1073 +1077 @@
     lab = new QColorShowLabel(this);
 
-#ifdef Q_WS_S60
+#ifdef QT_SMALL_COLORDIALOG
+#  ifdef Q_WS_S60
     QS60Data s60Data = QS60Data();
     const bool nonTouchUI = !s60Data.hasTouchscreen;
-#endif
-
+#  elif defined Q_WS_MAEMO_5
+    const bool nonTouchUI = false;
+#  endif
+#endif
 
 #ifndef Q_WS_WINCE
-#ifdef Q_WS_S60
+#ifdef QT_SMALL_COLORDIALOG
     lab->setMinimumHeight(60);
 #endif
@@ -1091 +1098 @@
 // For QVGA screens only the comboboxes and color label are visible.
 // For nHD screens only color and luminence pickers and color label are visible.
-#ifndef Q_WS_S60
+#if !defined(QT_SMALL_COLORDIALOG)
     gl->addWidget(lab, 0, 0, -1, 1);
 #else
@@ -1109 +1116 @@
 #endif
     lblHue->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
-#ifndef Q_WS_S60
+#if !defined(QT_SMALL_COLORDIALOG)
     gl->addWidget(lblHue, 0, 1);
     gl->addWidget(hEd, 0, 2);
@@ -1128 +1135 @@
 #endif
     lblSat->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
-#ifndef Q_WS_S60
+#if !defined(QT_SMALL_COLORDIALOG)
     gl->addWidget(lblSat, 1, 1);
     gl->addWidget(sEd, 1, 2);
@@ -1147 +1154 @@
 #endif
     lblVal->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
-#ifndef Q_WS_S60
+#if !defined(QT_SMALL_COLORDIALOG)
     gl->addWidget(lblVal, 2, 1);
     gl->addWidget(vEd, 2, 2);
@@ -1166 +1173 @@
 #endif
     lblRed->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
-#ifndef Q_WS_S60
+#if !defined(QT_SMALL_COLORDIALOG)
     gl->addWidget(lblRed, 0, 3);
     gl->addWidget(rEd, 0, 4);
@@ -1185 +1192 @@
 #endif
     lblGreen->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
-#ifndef Q_WS_S60
+#if !defined(QT_SMALL_COLORDIALOG)
     gl->addWidget(lblGreen, 1, 3);
     gl->addWidget(gEd, 1, 4);
@@ -1204 +1211 @@
 #endif
     lblBlue->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
-#ifndef Q_WS_S60
+#if !defined(QT_SMALL_COLORDIALOG)
     gl->addWidget(lblBlue, 2, 3);
     gl->addWidget(bEd, 2, 4);
@@ -1223 +1230 @@
 #endif
     alphaLab->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
-#ifndef Q_WS_S60
+#if !defined(QT_SMALL_COLORDIALOG)
     gl->addWidget(alphaLab, 3, 1, 1, 3);
     gl->addWidget(alphaEd, 3, 4);
@@ -1468 +1475 @@
     leftLay = 0;
 
-#if (defined(Q_WS_WINCE) || defined(Q_WS_S60))
+#if defined(Q_WS_WINCE) || defined(QT_SMALL_COLORDIALOG)
     smallDisplay = true;
     const int lumSpace = 20;
@@ -1498 +1505 @@
 #endif
 
-#if defined(Q_WS_S60)
+#if defined(QT_SMALL_COLORDIALOG)
+#  if defined(Q_WS_S60)
     QS60Data s60Data = QS60Data();
     const bool nonTouchUI = !s60Data.hasTouchscreen;
+#  elif defined(Q_WS_MAEMO_5)
+    const bool nonTouchUI = false;
+#  endif
 #endif
 
@@ -1533 +1544 @@
     } else {
         // better color picker size for small displays
-#ifdef Q_WS_S60
+#if defined(QT_SMALL_COLORDIALOG)
         QSize screenSize = QApplication::desktop()->availableGeometry(QCursor::pos()).size();
         pWidth = pHeight = qMin(screenSize.width(), screenSize.height());
@@ -1559 +1570 @@
     cp->setFrameStyle(QFrame::Panel + QFrame::Sunken);
 
-#if defined(Q_WS_S60)
+#if defined(QT_SMALL_COLORDIALOG)
     if (!nonTouchUI) {
         pickLay->addWidget(cp);
@@ -1573 +1584 @@
 
     lp = new QColorLuminancePicker(q);
-#if defined(Q_WS_S60)
+#if defined(QT_SMALL_COLORDIALOG)
     QSize screenSize = QApplication::desktop()->availableGeometry(QCursor::pos()).size();
     const int minDimension = qMin(screenSize.height(), screenSize.width());
@@ -1597 +1608 @@
     QObject::connect(cs, SIGNAL(currentColorChanged(QColor)),
                      q, SIGNAL(currentColorChanged(QColor)));
-#if defined(Q_WS_S60)
+#if defined(QT_SMALL_COLORDIALOG)
     if (!nonTouchUI)
         pWidth -= cp->size().width();

trunk/src/gui/dialogs/qcolordialog.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qcolordialog_mac.mm

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -348 +348 @@
     }
 
+    QAbstractEventDispatcher::instance()->interrupt();
     if (mResultCode == NSCancelButton)
         mPriv->colorDialog()->reject();

trunk/src/gui/dialogs/qcolordialog_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qdialog.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -266 +266 @@
         setWindowFlags(windowFlags() | Qt::WindowOkButtonHint | QFlag(qt_wince_is_mobile() ? 0 : Qt::WindowCancelButtonHint));
 #endif
+
+#ifdef Q_WS_S60
+    if (S60->avkonComponentsSupportTransparency) {
+        bool noSystemBackground = testAttribute(Qt::WA_NoSystemBackground);
+        setAttribute(Qt::WA_TranslucentBackground); // also sets WA_NoSystemBackground
+        setAttribute(Qt::WA_NoSystemBackground, noSystemBackground); // restore system background attribute
+    }
+#endif
 }
 
@@ -294 +302 @@
     if (!qt_wince_is_smartphone())
         setWindowFlags(windowFlags() | Qt::WindowOkButtonHint | QFlag(qt_wince_is_mobile() ? 0 : Qt::WindowCancelButtonHint));
+#endif
+
+#ifdef Q_WS_S60
+    if (S60->avkonComponentsSupportTransparency) {
+        bool noSystemBackground = testAttribute(Qt::WA_NoSystemBackground);
+        setAttribute(Qt::WA_TranslucentBackground); // also sets WA_NoSystemBackground
+        setAttribute(Qt::WA_NoSystemBackground, noSystemBackground); // restore system background attribute
+    }
 #endif
 }

trunk/src/gui/dialogs/qdialog.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qdialog_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qdialogsbinarycompat_win.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qerrormessage.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qerrormessage.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qfiledialog.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -670 +670 @@
     if (changed & HideNameFilterDetails)
         setNameFilters(d->nameFilters);
+
+    if (changed & ShowDirsOnly)
+        setFilter((options & ShowDirsOnly) ? filter() & ~QDir::Files : filter() | QDir::Files);
 }
 
@@ -996 +999 @@
 
 
+/*
+    Strip the filters by removing the details, e.g. (*.*).
+*/
+QStringList qt_strip_filters(const QStringList &filters)
+{
+    QStringList strippedFilters;
+    QRegExp r(QString::fromLatin1(qt_file_dialog_filter_reg_exp));
+    for (int i = 0; i < filters.count(); ++i) {
+        QString filterName;
+        int index = r.indexIn(filters[i]);
+        if (index >= 0)
+            filterName = r.cap(1);
+        strippedFilters.append(filterName.simplified());
+    }
+    return strippedFilters;
+}
+
+
 /*!
     \since 4.4
@@ -1022 +1043 @@
         return;
 
-    if (testOption(HideNameFilterDetails)) {
-        QStringList strippedFilters;
-        QRegExp r(QString::fromLatin1(qt_file_dialog_filter_reg_exp));
-        for (int i = 0; i < cleanedFilters.count(); ++i) {
-            QString filterName;
-            int index = r.indexIn(cleanedFilters[i]);
-            if (index >= 0)
-                filterName = r.cap(1);
-            strippedFilters.append(filterName.simplified());
-        }
-        d->qFileDialogUi->fileTypeCombo->addItems(strippedFilters);
-    } else {
+    if (testOption(HideNameFilterDetails))
+        d->qFileDialogUi->fileTypeCombo->addItems(qt_strip_filters(cleanedFilters));
+    else
         d->qFileDialogUi->fileTypeCombo->addItems(cleanedFilters);
-    }
+
     d->_q_useNameFilter(0);
 }
@@ -1086 +1098 @@
         return;
     }
-
-    int i = d->qFileDialogUi->fileTypeCombo->findText(filter);
+    int i;
+    if (testOption(HideNameFilterDetails)) {
+        i = d->qFileDialogUi->fileTypeCombo->findText(qt_strip_filters(qt_make_filter_list(filter)).first());
+    } else {
+        i = d->qFileDialogUi->fileTypeCombo->findText(filter);
+    }
     if (i >= 0) {
         d->qFileDialogUi->fileTypeCombo->setCurrentIndex(i);
@@ -1207 +1223 @@
 {
     Q_D(QFileDialog);
-    if (d->nativeDialogInUse){
-        d->model->setFilter(d->filterForMode(filter()));
-        d->setFilter_sys();
-        return;
-    }
-
     d->fileMode = mode;
     d->retranslateWindowTitle();
@@ -1248 +1258 @@
     }
     setLabelText(Accept, buttonText);
+    if (d->nativeDialogInUse){
+        d->setFilter_sys();
+        return;
+    }
+
     d->qFileDialogUi->fileTypeCombo->setEnabled(!testOption(ShowDirsOnly));
     d->_q_updateOkButton();
@@ -1285 +1300 @@
     }
     d->retranslateWindowTitle();
+#if defined(Q_WS_MAC)
+    d->deleteNativeDialog_sys();
+    setAttribute(Qt::WA_DontShowOnScreen, false);
+#endif
 }
 
@@ -3230 +3249 @@
     QString path = index.data(QFileSystemModel::FilePathRole).toString();
     if (!currentLocation.isEmpty() && path.startsWith(currentLocation)) {
+#if defined(Q_OS_UNIX) || defined(Q_OS_WINCE)
+        if (currentLocation == QDir::separator())
+            return path.mid(currentLocation.length());
+#endif
         return path.mid(currentLocation.length() + 1);
     }
@@ -3285 +3308 @@
             dirModel = sourceModel;
         QString currentLocation = QDir::toNativeSeparators(dirModel->rootPath());
+#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
+        if (currentLocation.endsWith(QLatin1Char(':')))
+            currentLocation.append(sep);
+#endif
         if (currentLocation.contains(sep) && path != currentLocation) {
             QStringList currentLocationList = splitPath(currentLocation);

trunk/src/gui/dialogs/qfiledialog.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qfiledialog.ui

@@ -2 +2 @@
  <comment>*********************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qfiledialog_embedded.ui

@@ -2 +2 @@
  <comment>*********************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qfiledialog_mac.mm

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -640 +640 @@
 #ifndef QT_MAC_USE_COCOA
 #else
+    Q_Q(QFileDialog);
     QMacCocoaAutoReleasePool pool;
     QNSOpenSavePanelDelegate *delegate = static_cast<QNSOpenSavePanelDelegate *>(mDelegate);
     *(delegate->mQDirFilter) = model->filter();
+    delegate->mFileMode = fileMode;
+    [delegate->mSavePanel setTitle:qt_mac_QStringToNSString(q->windowTitle())];
+    [delegate->mSavePanel setPrompt:[delegate strip:acceptLabel]];
+    if (fileNameLabelExplicitlySat)
+        [delegate->mSavePanel setNameFieldLabel:[delegate strip:qFileDialogUi->fileNameLabel->text()]];
+
     [delegate updateProperties];
 #endif

trunk/src/gui/dialogs/qfiledialog_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qfiledialog_win.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qfileinfogatherer.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qfileinfogatherer_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qfilesystemmodel.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -1223 +1223 @@
         for (; it != urls.constEnd(); ++it) {
             QString path = (*it).toLocalFile();
-            success = QFile::copy(path, to + QFileInfo(path).fileName())
-                      && QFile::remove(path) && success;
+            success = QFile::rename(path, to + QFileInfo(path).fileName()) && success;
         }
         break;
@@ -1785 +1784 @@
         if (info.size() == -1 && parentNode != &root) {
 #else
-        if (info.size() == -1) {
+        if (info.size() == -1 && !info.isSymLink()) {
 #endif
             removeNode(parentNode, fileName);

trunk/src/gui/dialogs/qfilesystemmodel.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qfilesystemmodel_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -262 +262 @@
 
     inline int translateVisibleLocation(QFileSystemNode *parent, int row) const {
-        if (sortOrder == Qt::AscendingOrder)
-                return row;
-        if (parent->dirtyChildrenIndex == -1 || row < parent->dirtyChildrenIndex)
-            if (parent->dirtyChildrenIndex != -1)
+        if (sortOrder != Qt::AscendingOrder) {
+            if (parent->dirtyChildrenIndex == -1)
+                return parent->visibleChildren.count() - row - 1;
+
+            if (row < parent->dirtyChildrenIndex)
                 return parent->dirtyChildrenIndex - row - 1;
-            else
-                return parent->visibleChildren.count() - row - 1;
-        else
-            return row;
+        }
+
+        return row;
     }
 

trunk/src/gui/dialogs/qfontdialog.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qfontdialog.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qfontdialog_mac.mm

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qfontdialog_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qfscompleter_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qinputdialog.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qinputdialog.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qmessagebox.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -59 +59 @@
 #include <QtGui/qapplication.h>
 #include <QtGui/qtextedit.h>
+#include <QtGui/qtextbrowser.h>
 #include <QtGui/qmenu.h>
 #include "qdialog_p.h"
@@ -189 +190 @@
     QAbstractButton *detectedEscapeButton;
     QLabel *informativeLabel;
-#ifdef Q_OS_SYMBIAN
-    QTextEdit *textEdit;
+#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5)
+    QTextBrowser *textBrowser;
 #endif
     QPointer<QObject> receiverToDisconnectOnClose;
@@ -1727 +1728 @@
         "<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) 2009 Nokia Corporation and/or its subsidiary(-ies).</p>"
+        "<p>Copyright (C) 2010 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>"
@@ -2463 +2464 @@
         label->setWordWrap(true);
         QGridLayout *grid = static_cast<QGridLayout *>(layout());
-#ifdef Q_OS_SYMBIAN
+#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5)
         label->hide();
-        QTextEdit *textEdit = new QTextEdit(this);
-        textEdit->setReadOnly(true);
-        grid->addWidget(textEdit, 1, 1, 1, 1);
-        d->textEdit = textEdit;
+        QTextBrowser *textBrowser = new QTextBrowser(this);
+        textBrowser->setOpenExternalLinks(true);
+        grid->addWidget(textBrowser, 1, 1, 1, 1);
+        d->textBrowser = textBrowser;
 #else
         grid->addWidget(label, 1, 1, 1, 1);
@@ -2476 +2477 @@
     d->informativeLabel->setText(text);
 
-#ifdef Q_OS_SYMBIAN
-    //We need to put the informative label inside textEdit to enable scrolling of long texts.
-    d->textEdit->setText(d->informativeLabel->text());
+#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5)
+    //We need to put the informative label inside textBrowser to enable scrolling of long texts.
+    d->textBrowser->setText(d->informativeLabel->text());
 #endif
 

trunk/src/gui/dialogs/qmessagebox.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qnspanelproxy_mac.mm

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qpagesetupdialog.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qpagesetupdialog.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qpagesetupdialog_mac.mm

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qpagesetupdialog_unix.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qpagesetupdialog_unix_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qpagesetupdialog_win.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qprintdialog.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qprintdialog.qdoc

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qprintdialog_mac.mm

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qprintdialog_qws.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qprintdialog_unix.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qprintdialog_win.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qprintpreviewdialog.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -208 +208 @@
     QAction *printAction;
     QAction *pageSetupAction;
+#if defined(Q_WS_MAC) && !defined(QT_MAC_USE_COCOA)
+    QAction *closeAction;
+#endif
 
     QPointer<QObject> receiverToDisconnectOnClose;
@@ -288 +291 @@
     toolbar->addAction(pageSetupAction);
     toolbar->addAction(printAction);
+#if defined(Q_WS_MAC) && !defined(QT_MAC_USE_COCOA)
+    toolbar->addAction(closeAction);
+#endif
 
     // Cannot use the actions' triggered signal here, since it doesn't autorepeat
@@ -407 +413 @@
     QObject::connect(printAction, SIGNAL(triggered(bool)), q, SLOT(_q_print()));
     QObject::connect(pageSetupAction, SIGNAL(triggered(bool)), q, SLOT(_q_pageSetup()));
+#if defined(Q_WS_MAC) && !defined(QT_MAC_USE_COCOA)
+    closeAction = printerGroup->addAction(QCoreApplication::translate("QPrintPreviewDialog", "Close"));
+    QObject::connect(closeAction, SIGNAL(triggered(bool)), q, SLOT(reject()));
+#endif
 
     // Initial state:

trunk/src/gui/dialogs/qprintpreviewdialog.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qprogressdialog.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qprogressdialog.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qsidebar.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qsidebar_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qwizard.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qwizard.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qwizard_win.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/gui/dialogs/qwizard_win_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)