Changeset 561 for trunk/src/gui/dialogs/qwizard.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/dialogs/qwizard.cpp (modified) (30 diffs)

trunk/src/gui/dialogs/qwizard.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -21 +22 @@
 ** 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.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** 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
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -70 +70 @@
 #include <qdebug.h>
 
-#ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
 extern bool qt_wince_is_mobile();     //defined in qguifunctions_wce.cpp
 #endif
 
 #include <string.h>     // for memset()
+
+#ifdef QT_SOFTKEYS_ENABLED
+#include "qaction.h"
+#endif
 
 QT_BEGIN_NAMESPACE
@@ -84 +88 @@
 const int MacButtonTopMargin = 13;
 const int MacLayoutLeftMargin = 20;
-const int MacLayoutTopMargin = 14;
+//const int MacLayoutTopMargin = 14; // Unused. Save some space and avoid warning.
 const int MacLayoutRightMargin = 20;
 const int MacLayoutBottomMargin = 17;
@@ -245 +249 @@
            && topLevelMarginRight == other.topLevelMarginRight
            && topLevelMarginTop == other.topLevelMarginTop
-           && topLevelMarginBottom == other.topLevelMarginBottom 
+           && topLevelMarginBottom == other.topLevelMarginBottom
            && childMarginLeft == other.childMarginLeft
            && childMarginRight == other.childMarginRight
@@ -329 +333 @@
     QWizard *wiz = parentWidget() ? qobject_cast <QWizard *>(parentWidget()->parentWidget()) : 0;
     if (wiz) {
-        // Designer dosen't support the Vista style for Wizards. This property is used to turn 
+        // Designer dosen't support the Vista style for Wizards. This property is used to turn
         // off the Vista style.
         const QVariant v = wiz->property("_q_wizard_vista_off");
@@ -344 +348 @@
     bool modern = ((info.wizStyle == QWizard::ModernStyle)
 #if !defined(QT_NO_STYLE_WINDOWSVISTA)
-        || ((info.wizStyle == QWizard::AeroStyle)
-            && (QVistaHelper::vistaState() == QVistaHelper::Classic) || vistaDisabled())
+        || ((info.wizStyle == QWizard::AeroStyle
+            && QVistaHelper::vistaState() == QVistaHelper::Classic) || vistaDisabled())
 #endif
     );
@@ -378 +382 @@
             There is no widthForHeight() function, so we simulate it with a loop.
         */
-        int candidateSubTitleWidth = qMin(512, 2 * qApp->desktop()->width() / 3);
+        int candidateSubTitleWidth = qMin(512, 2 * QApplication::desktop()->width() / 3);
         int delta = candidateSubTitleWidth >> 1;
         while (delta > 0) {
@@ -524 +528 @@
         , maximumHeight(QWIDGETSIZE_MAX)
     {
-        for (int i = 0; i < QWizard::NButtons; ++i)
+        for (int i = 0; i < QWizard::NButtons; ++i) {
             btns[i] = 0;
+#ifdef QT_SOFTKEYS_ENABLED
+            softKeys[i] = 0;
+#endif
+        }
 #if !defined(QT_NO_STYLE_WINDOWSVISTA)
         if (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA
@@ -561 +569 @@
     void _q_emitCustomButtonClicked();
     void _q_updateButtonStates();
+    void _q_handleFieldObjectDestroyed(QObject *);
     void setStyle(QStyle *style);
 #ifdef Q_WS_MAC
@@ -609 +618 @@
     QLabel *subTitleLabel;
     QWizardRuler *bottomRuler;
+#ifdef QT_SOFTKEYS_ENABLED
+    mutable QAction *softKeys[QWizard::NButtons];
+#endif
 
     QVBoxLayout *pageVBoxLayout;
@@ -634 +646 @@
     const bool macStyle = (wstyle == QWizard::MacStyle);
     switch (which) {
-    case QWizard::BackButton: 
+    case QWizard::BackButton:
         return macStyle ? QWizard::tr("Go Back") : QWizard::tr("< &Back");
-    case QWizard::NextButton: 
+    case QWizard::NextButton:
         if (macStyle)
             return QWizard::tr("Continue");
@@ -732 +744 @@
 void QWizardPrivate::addField(const QWizardField &field)
 {
+    Q_Q(QWizard);
+
     QWizardField myField = field;
     myField.resolve(defaultPropertyTable);
@@ -745 +759 @@
         QObject::connect(myField.object, myField.changedSignal,
                          myField.page, SLOT(_q_maybeEmitCompleteChanged()));
+    QObject::connect(
+        myField.object, SIGNAL(destroyed(QObject*)), q,
+        SLOT(_q_handleFieldObjectDestroyed(QObject*)));
 }
 
 void QWizardPrivate::removeFieldAt(int index)
 {
+    Q_Q(QWizard);
+
     const QWizardField &field = fields.at(index);
     fieldIndexMap.remove(field.name);
@@ -754 +773 @@
         QObject::disconnect(field.object, field.changedSignal,
                             field.page, SLOT(_q_maybeEmitCompleteChanged()));
+    QObject::disconnect(
+        field.object, SIGNAL(destroyed(QObject*)), q,
+        SLOT(_q_handleFieldObjectDestroyed(QObject*)));
     fields.remove(index);
 }
@@ -949 +971 @@
             mainLayout->setMargin(0);
             mainLayout->setSpacing(0);
-            pageVBoxLayout->setContentsMargins(deltaMarginLeft, deltaMarginTop, 
+            pageVBoxLayout->setContentsMargins(deltaMarginLeft, deltaMarginTop,
                                                deltaMarginRight, deltaMarginBottom);
-            buttonLayout->setContentsMargins(info.topLevelMarginLeft, info.topLevelMarginTop, 
+            buttonLayout->setContentsMargins(info.topLevelMarginLeft, info.topLevelMarginTop,
                                              info.topLevelMarginRight, info.topLevelMarginBottom);
         } else {
-            mainLayout->setContentsMargins(info.topLevelMarginLeft, info.topLevelMarginTop, 
+            mainLayout->setContentsMargins(info.topLevelMarginLeft, info.topLevelMarginTop,
                                            info.topLevelMarginRight, info.topLevelMarginBottom);
             mainLayout->setHorizontalSpacing(info.hspacing);
@@ -1202 +1224 @@
         Q_ASSERT(bottomSpacer);
         bottomSpacer->changeSize(0, 0, QSizePolicy::Ignored, expandPage ? QSizePolicy::Ignored : QSizePolicy::MinimumExpanding);
-        pageVBoxLayout->invalidate();        
+        pageVBoxLayout->invalidate();
     }
 
@@ -1241 +1263 @@
 #endif
     QSize minimumSize = mainLayout->totalMinimumSize() + QSize(0, extraHeight);
-    QSize maximumSize;
-#if defined(Q_WS_WIN)
-    if (QSysInfo::WindowsVersion > QSysInfo::WV_Me) // ### See Tasks 164078 and 161660
-#endif
-    maximumSize = mainLayout->totalMaximumSize();
+    QSize maximumSize = mainLayout->totalMaximumSize();
     if (info.header && headerWidget->maximumWidth() != QWIDGETSIZE_MAX) {
         minimumSize.setWidth(headerWidget->maximumWidth());
@@ -1321 +1339 @@
         if (which < QWizard::NStandardButtons)
             pushButton->setText(buttonDefaultText(wizStyle, which, this));
+
+#ifdef QT_SOFTKEYS_ENABLED
+        QAction *softKey = new QAction(pushButton->text(), pushButton);
+        QAction::SoftKeyRole softKeyRole;
+        switch(which) {
+        case QWizard::NextButton:
+        case QWizard::FinishButton:
+        case QWizard::CancelButton:
+            softKeyRole = QAction::NegativeSoftKey;
+            break;
+        case QWizard::BackButton:
+        case QWizard::CommitButton:
+        case QWizard::HelpButton:
+        case QWizard::CustomButton1:
+        case QWizard::CustomButton2:
+        case QWizard::CustomButton3:
+        default:
+            softKeyRole = QAction::PositiveSoftKey;
+            break;
+        }
+        softKey->setSoftKeyRole(softKeyRole);
+        softKeys[which] = softKey;
+#endif
         connectButton(which);
     }
@@ -1334 +1375 @@
         QObject::connect(btns[which], SIGNAL(clicked()), q, SLOT(_q_emitCustomButtonClicked()));
     }
+
+#ifdef QT_SOFTKEYS_ENABLED
+    QObject::connect(softKeys[which], SIGNAL(triggered()), btns[which], SIGNAL(clicked()));
+#endif
 }
 
@@ -1347 +1392 @@
             else if (i < QWizard::NStandardButtons)
                 btns[i]->setText(buttonDefaultText(wizStyle, i, this));
+#ifdef QT_SOFTKEYS_ENABLED
+            softKeys[i]->setText(btns[i]->text());
+#endif
         }
     }
@@ -1466 +1514 @@
     inHandleAeroStyleChange = true;
 
-    vistaHelper->backButton()->disconnect();
+    vistaHelper->disconnectBackButton();
     q->removeEventFilter(vistaHelper);
 
@@ -1490 +1538 @@
     } else {
         q->setMouseTracking(true); // ### original value possibly different
+#ifndef QT_NO_CURSOR
         q->unsetCursor(); // ### ditto
+#endif
         antiFlickerWidget->move(0, 0);
-        vistaHelper->backButton()->hide();
+        vistaHelper->hideBackButton();
         vistaHelper->setTitleBarIconAndCaptionVisible(true);
     }
@@ -1589 +1639 @@
 #endif
 
+#ifdef QT_SOFTKEYS_ENABLED
+    QAbstractButton *wizardButton;
+    for (int i = 0; i < QWizard::NButtons; ++i) {
+        wizardButton = btns[i];
+        if (wizardButton && !wizardButton->testAttribute(Qt::WA_WState_Hidden)) {
+            wizardButton->hide();
+            q->addAction(softKeys[i]);
+        } else {
+            q->removeAction(softKeys[i]);
+        }
+    }
+#endif
+
     enableUpdates();
+}
+
+void QWizardPrivate::_q_handleFieldObjectDestroyed(QObject *object)
+{
+    QVector<QWizardField>::iterator it = fields.begin();
+    while (it != fields.end()) {
+        const QWizardField &field = *it;
+        if (field.object == object) {
+            fieldIndexMap.remove(field.name);
+            it = fields.erase(it);
+        } else {
+            ++it;
+        }
+    }
 }
 
@@ -1603 +1680 @@
 
 #ifdef Q_WS_MAC
-
-#ifdef Q_WS_MAC32
-QT_BEGIN_INCLUDE_NAMESPACE
-#include <QuickTime/QuickTime.h>
-QT_END_INCLUDE_NAMESPACE
-typedef OSErr (*PtrQTNewDataReferenceFromCFURL)(CFURLRef, UInt32, Handle*, OSType*);
-typedef OSErr (*PtrGetGraphicsImporterForDataRefWithFlags)(Handle, OSType, ComponentInstance*, long);
-typedef ComponentResult (*PtrGraphicsImportSetFlags)(GraphicsImportComponent, long);
-typedef ComponentResult (*PtrGraphicsImportCreateCGImage)(GraphicsImportComponent, CGImageRef*, UInt32);
-
-static PtrQTNewDataReferenceFromCFURL ptrQTNewDataReferenceFromCFURL = 0;
-static PtrGetGraphicsImporterForDataRefWithFlags ptrGetGraphicsImporterForDataRefWithFlags = 0;
-static PtrGraphicsImportSetFlags ptrGraphicsImportSetFlags = 0;
-static PtrGraphicsImportCreateCGImage ptrGraphicsImportCreateCGImage = 0;
-
-static bool resolveQuickTimeSymbols()
-{
-    if (ptrQTNewDataReferenceFromCFURL == 0) {
-        QLibrary library(QLatin1String("/System/Library/Frameworks/QuickTime.framework/QuickTime"));
-        ptrQTNewDataReferenceFromCFURL = reinterpret_cast<PtrQTNewDataReferenceFromCFURL>(library.resolve("QTNewDataReferenceFromCFURL"));
-        ptrGetGraphicsImporterForDataRefWithFlags = reinterpret_cast<PtrGetGraphicsImporterForDataRefWithFlags>(library.resolve("GetGraphicsImporterForDataRefWithFlags"));
-        ptrGraphicsImportSetFlags = reinterpret_cast<PtrGraphicsImportSetFlags>(library.resolve("GraphicsImportSetFlags"));
-        ptrGraphicsImportCreateCGImage = reinterpret_cast<PtrGraphicsImportCreateCGImage>(library.resolve("GraphicsImportCreateCGImage"));
-    }
-
-    return ptrQTNewDataReferenceFromCFURL != 0 && ptrGetGraphicsImporterForDataRefWithFlags != 0
-           && ptrGraphicsImportSetFlags != 0 && ptrGraphicsImportCreateCGImage != 0;
-}
-
-
-static QPixmap quicktimeTiff(const CFURLRef url)
-{
-    if (!resolveQuickTimeSymbols())
-        return QPixmap();
-
-    QCFType <CGImageRef> imageRef = 0;
-    Handle dataRef;
-    OSType dataRefType;
-    GraphicsImportComponent gi;
-    ComponentResult result;
-    result = ptrQTNewDataReferenceFromCFURL(url, 0, &dataRef, &dataRefType);
-    if (dataRef != 0) {
-        OSStatus err = ptrGetGraphicsImporterForDataRefWithFlags(dataRef, dataRefType, &gi, 0);
-        if (err == noErr && gi) {
-            result = ptrGraphicsImportSetFlags(gi, (kGraphicsImporterDontDoGammaCorrection
-                                                    + kGraphicsImporterDontUseColorMatching));
-            if (!result)
-                result = ptrGraphicsImportCreateCGImage(gi, &imageRef, 0);
-            if (result)
-                qWarning("Qt: Problem reading TIFF image %ld(%s:%d)", result, __FILE__, __LINE__);
-            DisposeHandle(dataRef);
-            CloseComponent(gi);
-        }
-    }
-
-    if (imageRef)
-        return QPixmap::fromMacCGImageRef(imageRef);
-    return QPixmap();
-}
-#endif // Q_WS_MAC32
 
 QPixmap QWizardPrivate::findDefaultBackgroundPixmap()
@@ -1675 +1692 @@
             url = CFBundleCopyResourceURL(bundle, CFSTR("Background"), CFSTR("tif"), 0);
             if (url) {
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
-                if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_4) {
-                    QCFType<CGImageSourceRef> imageSource = CGImageSourceCreateWithURL(url, 0);
-                    QCFType<CGImageRef> image = CGImageSourceCreateImageAtIndex(imageSource, 0, 0);
-                    if (image) {
-                        int width = CGImageGetWidth(image);
-                        int height = CGImageGetHeight(image);
-                        if (width == ExpectedImageWidth && height == ExpectedImageHeight)
-                            return QPixmap::fromMacCGImageRef(image);
-                    }
-                } else
-#endif
-                {
-#ifdef Q_WS_MAC32
-                    return quicktimeTiff(url);
-#endif
+                QCFType<CGImageSourceRef> imageSource = CGImageSourceCreateWithURL(url, 0);
+                QCFType<CGImageRef> image = CGImageSourceCreateImageAtIndex(imageSource, 0, 0);
+                if (image) {
+                    int width = CGImageGetWidth(image);
+                    int height = CGImageGetHeight(image);
+                    if (width == ExpectedImageWidth && height == ExpectedImageHeight)
+                        return QPixmap::fromMacCGImageRef(image);
                 }
             }
@@ -2121 +2129 @@
     Q_D(QWizard);
     d->init();
-#ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
     if (!qt_wince_is_mobile())
         setWindowFlags(windowFlags() & ~Qt::WindowOkButtonHint);
@@ -2837 +2845 @@
     Q_D(const QWizard);
     QSize result = d->mainLayout->totalSizeHint();
+#ifdef Q_WS_S60
+    QSize extra(QApplication::desktop()->availableGeometry(QCursor::pos()).size());
+#else
     QSize extra(500, 360);
+#endif
     if (d->wizStyle == MacStyle && d->current != -1) {
         QSize pixmap(currentPage()->pixmap(BackgroundPixmap).size());
@@ -3437 +3449 @@
     changes. This ensures that QWizard updates the enabled or disabled state of
     its buttons. An example of the reimplementation is
-    available \l{http://doc.trolltech.com/qq/qq22-qwizard.html#validatebeforeitstoolate}
-    {here}. 
+    available \l{http://qt.nokia.com/doc/qq/qq22-qwizard.html#validatebeforeitstoolate}
+    {here}.
 
     \sa completeChanged(), isFinalPage()