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

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

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

trunk/src/gui/dialogs/qwizard.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -219 +219 @@
       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),
+      (false) {}
 
     int topLevelMarginLeft;
@@ -239 +239 @@
     bool subTitle;
     bool extension;
+
 
     bool operator==(const QWizardLayoutInfo &other);
@@ -262 +263 @@
            && title == other.title
            && subTitle == other.subTitle
-           && extension == other.extension;
+           && extension == other.extension
+           && sideWidget == other.sideWidget;
 }
 
@@ -426 +428 @@
 };
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 class QWizardPagePrivate : public QWidgetPrivate
 {
@@ -502 +538 @@
     inline QWizardPrivate()
         : start(-1)
+
         , current(-1)
         , canContinue(false)
@@ -514 +551 @@
         , headerWidget(0)
         , watermarkLabel(0)
+
         , titleLabel(0)
         , subTitleLabel(0)
@@ -582 +620 @@
     QSet<int> initialized; // ### remove and move bit to QWizardPage?
     int start;
+
     int current;
     bool canContinue;
@@ -613 +652 @@
     QWidget *placeholderWidget2;
     QWizardHeader *headerWidget;
-    QLabel *watermarkLabel;
+    QWatermarkLabel *watermarkLabel;
+    QWidget *sideWidget;
     QFrame *pageFrame;
     QLabel *titleLabel;
@@ -908 +948 @@
     info.header = (info.wizStyle == QWizard::ClassicStyle || info.wizStyle == QWizard::ModernStyle)
         && !(opts & QWizard::IgnoreSubTitles) && !subTitleText.isEmpty();
+
     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 =  && (opts & QWizard::ExtendedWatermarkPixmap);
 
     return info;
@@ -955 +996 @@
     if (mac) {
         numColumns = 3;
-    } else if (info.watermark) {
+    } else if (info.watermark) {
         numColumns = 2;
     } else {
@@ -1097 +1138 @@
     }
 
-    if (info.watermark && !watermarkLabel) {
-        watermarkLabel = new QLabel(antiFlickerWidget);
+    if ( && !watermarkLabel) {
+        watermarkLabel = new QWidget);
         watermarkLabel->setBackgroundRole(QPalette::Base);
         watermarkLabel->setMinimumHeight(1);
@@ -1174 +1215 @@
     mainLayout->addLayout(buttonLayout, row++, buttonStartColumn, 1, buttonNumColumns);
 
-    if (info.watermark) {
+    if (info.watermark) {
         if (info.extension)
             watermarkEndRow = row;
@@ -1194 +1235 @@
         bottomRuler->setVisible(classic || modern);
     if (watermarkLabel)
-        watermarkLabel->setVisible(info.watermark);
+        watermarkLabel->setVisible(info.watermark);
 
     layoutInfo = info;
@@ -1234 +1275 @@
     }
 
-    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);
@@ -1268 +1316 @@
         maximumSize.setWidth(headerWidget->maximumWidth());
     }
-    if (info.watermark) {
+    if (info.watermark) {
         minimumSize.setHeight(mainLayout->totalSizeHint().height());
         maximumSize.setHeight(mainLayout->totalSizeHint().height());
@@ -2150 +2198 @@
     QWizard so far.
 
-    \sa setPage(), page()
+    \sa setPage(), page()
 */
 int QWizard::addPage(QWizardPage *page)
@@ -2167 +2215 @@
     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)
@@ -2211 +2262 @@
     page->hide();
     d->pageVBoxLayout->setEnabled(pageVBoxLayoutEnabled);
+
+
+
+
 }
 
 /*!
     Removes the page with the given \a id. cleanupPage() will be called if necessary.
+
+
+
     \since 4.5
-    \sa addPage(), setPage()
+    \sa addPage(), setPage()
 */
 void QWizard::removePage(int id)
@@ -2224 +2282 @@
     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)) {
@@ -2335 +2409 @@
 {
     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;
 }
 
@@ -2345 +2429 @@
 {
     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;
 }
 
@@ -2826 +2906 @@
 
 /*!
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     \reimp
 */
@@ -2876 +3005 @@
 
     \sa currentId(), currentPage()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 */