Changeset 561 for trunk/src/gui/dialogs/qprogressdialog.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/qprogressdialog.cpp (modified) (13 diffs)

trunk/src/gui/dialogs/qprogressdialog.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$
 **
@@ -58 +58 @@
 #include <limits.h>
 
+#if defined(QT_SOFTKEYS_ENABLED)
+#include <qaction.h>
+#endif
+#ifdef Q_WS_S60
+#include <QtGui/qdesktopwidget.h>
+#endif
+
+
 QT_BEGIN_NAMESPACE
 
@@ -77 +85 @@
 #ifndef QT_NO_SHORTCUT
         escapeShortcut(0),
+#endif
+#ifdef QT_SOFTKEYS_ENABLED
+        cancelAction(0),
 #endif
         useDefaultCancelText(false)
@@ -103 +114 @@
 #ifndef QT_NO_SHORTCUT
     QShortcut *escapeShortcut;
+#endif
+#ifdef QT_SOFTKEYS_ENABLED
+    QAction *cancelAction;
 #endif
     bool useDefaultCancelText;
@@ -197 +211 @@
   \class QProgressDialog
   \brief The QProgressDialog class provides feedback on the progress of a slow operation.
-  \ingroup dialogs
-  \mainclass
+  \ingroup standard-dialogs
+
 
   A progress dialog is used to give the user an indication of how long
@@ -432 +446 @@
     resize(w, h);
     if (cancelButton)
+#if !defined(QT_SOFTKEYS_ENABLED)
         cancelButton->show();
+#else
+    {
+        d->cancelAction = new QAction(cancelButton->text(), cancelButton);
+        d->cancelAction->setSoftKeyRole(QAction::NegativeSoftKey);
+        connect(d->cancelAction, SIGNAL(triggered()), this, SIGNAL(canceled()));
+        addAction(d->cancelAction);
+    }
+#endif
 }
 
@@ -449 +472 @@
 
     if (!cancelButtonText.isNull()) {
-        if (d->cancel)
+        if (d->cancel) {
             d->cancel->setText(cancelButtonText);
-        else
+#ifdef QT_SOFTKEYS_ENABLED
+            d->cancelAction->setText(cancelButtonText);
+#endif
+        } else {
             setCancelButton(new QPushButton(cancelButtonText, this));
+        }
     } else {
         setCancelButton(0);
@@ -627 +654 @@
   \warning If the progress dialog is modal
     (see QProgressDialog::QProgressDialog()),
-    this function calls QApplication::processEvents(), so take care that
+    setValue() calls QApplication::processEvents(), so take care that
     this does not cause undesirable re-entrancy in your code. For example,
     don't use a QProgressDialog inside a paintEvent()!
@@ -644 +671 @@
     if (d->shown_once) {
         if (isModal())
-            qApp->processEvents();
+            QApplication::processEvents();
     } else {
         if (progress == 0) {
@@ -702 +729 @@
     if (d->cancel)
         h += d->cancel->sizeHint().height() + spacing;
+#ifdef Q_WS_S60
+    if (QApplication::desktop()->size().height() > QApplication::desktop()->size().width())
+        return QSize(qMax(QApplication::desktop()->size().width(), sh.width() + 2 * margin), h);
+    else
+        return QSize(qMax(QApplication::desktop()->size().height(), sh.width() + 2 * margin), h);
+#else
     return QSize(qMax(200, sh.width() + 2 * margin), h);
+#endif
 }
 
@@ -719 +753 @@
 {
     Q_D(QProgressDialog);
-    if (ev->type() == QEvent::StyleChange)
+    if (ev->type() == QEvent::StyleChange) {
         d->layout();
-    else if (ev->type() == QEvent::LanguageChange)
+    } else if (ev->type() == QEvent::LanguageChange) {
         d->retranslateStrings();
+    }
     QDialog::changeEvent(ev);
 }